forked from n6cta/mwtchahrd
Compare commits
5 Commits
c9f6a4a6c5
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
| f452e72ef9 | |||
|
|
796035ac59 | ||
|
|
b14f4eee6a | ||
|
|
5cd273a476 | ||
|
|
a62cb8630b |
34
README.md
34
README.md
@@ -37,7 +37,7 @@ The compiled executable will be located in the `target/release` directory.
|
||||
Run the executable with the required arguments:
|
||||
|
||||
```bash
|
||||
mwtchahrd -i <IP> -p <PORT> [-c <CHANNEL>] [-d] [-u]
|
||||
mwtchahrd -i <IP> -p <PORT> [-c <CHANNEL>] [-d] [-u]
|
||||
```
|
||||
|
||||
### Command‑Line Arguments
|
||||
@@ -56,6 +56,30 @@ mwtchahrd -i <IP> -p <PORT> [-c <CHANNEL>] [-d] [-u]
|
||||
|
||||
- `-u, --ui_only`
|
||||
Only display frames with a UI payload. When this flag is set, frames that are not UI are skipped.
|
||||
|
||||
- `-b, --uip <UIP>`
|
||||
Send UDP to what IP address (e.g. 127.0.0.1) [default: 127.0.0.1].
|
||||
|
||||
- `-k, --uport <UPORT>`
|
||||
Send UDP to what port (e.g. 8000; 55555 disables UDP) [default: 55555].
|
||||
|
||||
- `-s, --spotter <SPOTTER>`
|
||||
Spotter callsign (e.g. W1CDN).
|
||||
|
||||
- `-o, --spothole`
|
||||
Spot UI frames to a Spothole server.
|
||||
|
||||
- `-O, --spothole-alt <SPOTHOLE_ALT>`
|
||||
Provide a different URL than https://spothole.app/api/v1/spot.
|
||||
|
||||
- `-f, --freq <FREQ>`
|
||||
Spotting frequency [default: 14105000].
|
||||
|
||||
- `-h, --help`
|
||||
Print help.
|
||||
|
||||
- `-V, --version`
|
||||
Print version.
|
||||
|
||||
## Examples
|
||||
|
||||
@@ -83,6 +107,14 @@ Monitor only UI frames:
|
||||
mwtchahrd -i 127.0.0.1 -p 8000 -u
|
||||
```
|
||||
|
||||
### Spotting to [Spothole.app](https://spothole.app) API
|
||||
|
||||
Sends only UI frames and mode is hardcoded as `PKT`. Spot from callsign `W1CDN` and report fixed frequency 14.105 MHz:
|
||||
|
||||
```bash
|
||||
mwtchahrd --ip 192.168.0.6 --port 8000 --spotter W1CDN --spothole --freq 14105000
|
||||
```
|
||||
|
||||
## Code Overview
|
||||
|
||||
- **Validation Functions:**
|
||||
|
||||
20
src/main.rs
20
src/main.rs
@@ -35,7 +35,7 @@ struct Cli {
|
||||
/// AGWPE server IP address (e.g. 127.0.0.1)
|
||||
#[arg(short = 'i', long)]
|
||||
ip: std::net::IpAddr,
|
||||
|
||||
|
||||
/// AGWPE server TCP port (e.g. 8000)
|
||||
#[arg(short = 'p', long, value_parser = validate_port)]
|
||||
port: u16,
|
||||
@@ -64,10 +64,14 @@ struct Cli {
|
||||
#[arg(short = 's', long)]
|
||||
spotter: Option<String>,
|
||||
|
||||
/// Spot UI frames to Spothole
|
||||
/// Spot UI frames to a Spothole server
|
||||
#[arg(short = 'o', long, default_value_t = false)]
|
||||
spothole: bool,
|
||||
|
||||
/// Provide a different URL than https://spothole.app/api/v1/spot
|
||||
#[arg(short = 'O', long)]
|
||||
spothole_alt: Option<String>,
|
||||
|
||||
/// Spotting frequency
|
||||
#[arg(short = 'f', long, default_value_t = 14105000)]
|
||||
freq: u32,
|
||||
@@ -374,6 +378,13 @@ fn handle_frame(frame: &AgwFrame, cli: &Cli, buffers: &mut BufferManager) {
|
||||
let timestamp = Local::now().format("%H:%M:%S").to_string();
|
||||
let spotter = &cli.spotter;
|
||||
let freq = &cli.freq;
|
||||
//let spothole_alt = &cli.spothole_alt;
|
||||
|
||||
// If user provides an alternate Spothole URL, use that one
|
||||
let spothole_url = match &cli.spothole_alt {
|
||||
Some(spothole_alt) => spothole_alt,
|
||||
None => &"https://spothole.app/api/v1/spot".to_string(),
|
||||
};
|
||||
|
||||
// Filter and compute the text from the payload only once.
|
||||
let text = filter_text(&frame.payload);
|
||||
@@ -417,6 +428,9 @@ fn handle_frame(frame: &AgwFrame, cli: &Cli, buffers: &mut BufferManager) {
|
||||
// --data '{"dx_call":"M0TRT","time":1760019539, "freq":14200000,
|
||||
// "comment":"Test spot please ignore", "de_call":"M0TRT"}' https://spothole.app/api/v1/spot
|
||||
|
||||
println!("spothole_url: {}", spothole_url);
|
||||
|
||||
|
||||
// POST JSON
|
||||
let packet = json!({
|
||||
"dx_call": &source,
|
||||
@@ -429,7 +443,7 @@ fn handle_frame(frame: &AgwFrame, cli: &Cli, buffers: &mut BufferManager) {
|
||||
"time": SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs(),
|
||||
});
|
||||
let client = reqwest::blocking::Client::new();
|
||||
let res = client.post("https://spothole.app/api/v1/spot")
|
||||
let res = client.post(spothole_url)
|
||||
.json(&packet)
|
||||
.send();
|
||||
println!("res = {res:?}");
|
||||
|
||||
Reference in New Issue
Block a user