1
0
mirror of https://gitea.farpn.net/w1cdn/mwtchahrd.git synced 2025-12-10 06:28:02 -06:00

Compare commits

...

3 Commits

Author SHA1 Message Date
mattbk
97e955156d Update README. 2025-11-15 21:21:41 -06:00
mattbk
c60723b0a5 Update README. 2025-11-15 21:18:48 -06:00
mattbk
780c4b5884 Add simple filter for text strings in source call-SSID. 2025-11-15 21:07:23 -06:00
2 changed files with 42 additions and 35 deletions

View File

@@ -74,6 +74,15 @@ mwtchahrd -i <IP> -p <PORT> [-c <CHANNEL>] [-d] [-u]
- `-f, --freq <FREQ>` - `-f, --freq <FREQ>`
Spotting frequency [default: 14105000]. Spotting frequency [default: 14105000].
- `-y, --my-lat <MY_LAT>`
Spotter latitude, DD.dddd.
- `-x, --my-lon <MY_LON>`
Spotter longitude, DD.dddd.
- `-t, --filter <CALL-SSID,CALL-SSID,...>`
Filter out spots from these callsign-UUID combinations (self spots, for example), comma-separated. This is not regex, just full matches.
- `-h, --help` - `-h, --help`
Print help. Print help.
@@ -109,10 +118,10 @@ mwtchahrd -i 127.0.0.1 -p 8000 -u
### Spotting to [Spothole.app](https://spothole.app) API ### 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: Sends only UI frames and mode is hardcoded as `PKT`. Spot from callsign `W1CDN` and report fixed frequency 14.105 MHz. Report your location as spotter and don't spot your own beacons.
```bash ```bash
mwtchahrd --ip 192.168.0.6 --port 8000 --spotter W1CDN --spothole --freq 14105000 mwtchahrd --ip 192.168.0.6 --port 8000 --spotter W1CDN --spothole --freq 14105000 --my-lat 47.01 --my-lon -97.01 --filter W1CDN-1,W1CDN-7
``` ```
## Code Overview ## Code Overview

View File

@@ -83,13 +83,13 @@ struct Cli {
#[arg(short = 'y', long, allow_negative_numbers = true)] #[arg(short = 'y', long, allow_negative_numbers = true)]
my_lat: Option<f64>, my_lat: Option<f64>,
/// Spotter longitude DD.dddd; to send negaitve (W or S), use = e.g. --my-lon=-97.1 /// Spotter longitude DD.dddd
#[arg(short = 'x', long, allow_negative_numbers = true)] #[arg(short = 'x', long, allow_negative_numbers = true)]
my_lon: Option<f64>, my_lon: Option<f64>,
/// Filter out spots from these callsign-UUID combinations (self spots, for example), comma-separated /// Filter out spots from these callsign-UUID combinations (self spots, for example), comma-separated
#[arg(short = 't', long, value_delimiter = ',')] #[arg(short = 't', long, value_delimiter = ',', num_args = 1..,)]
filter: Option<String>, filter: Vec<String>,
} }
@@ -454,12 +454,7 @@ fn handle_frame(frame: &AgwFrame, cli: &Cli, buffers: &mut BufferManager, loc_st
if cli.ui_only && summary != "UI" { if cli.ui_only && summary != "UI" {
return; return;
} }
// Ignore frames where source matches one of the filtered strings
TODO finish this
if cli.filter {
return;
}
// In non-debug mode, print the session line and any additional lines. // In non-debug mode, print the session line and any additional lines.
if !cli.debug { if !cli.debug {
print_session_line(&timestamp, &source, &final_destination, &summary); print_session_line(&timestamp, &source, &final_destination, &summary);
@@ -493,30 +488,33 @@ fn handle_frame(frame: &AgwFrame, cli: &Cli, buffers: &mut BufferManager, loc_st
//println!("Stored location: {} {}", stored_loc[0].clone(), stored_loc[1].clone()); //println!("Stored location: {} {}", stored_loc[0].clone(), stored_loc[1].clone());
// If Spothole is enabled // If Spothole is enabled and this is a UI frame and the source is not filtered
if summary == "UI" && cli.spothole { if summary == "UI" && cli.spothole && !cli.filter.contains(&source){
// POST JSON // POST JSON
let packet = json!({ let packet = json!({
"dx_call": &source_call, "dx_call": &source_call,
"dx_ssid": &source_ssid, "dx_ssid": &source_ssid,
"de_call": &my_call, "de_call": &my_call,
"de_latitude": &my_lat, "de_latitude": &my_lat,
"de_longitude": &my_lon, "de_longitude": &my_lon,
"freq": &freq, "freq": &freq,
"comment": &text, "comment": &text,
"dx_latitude": &json_lat, "dx_latitude": &json_lat,
"dx_longitude": &json_lon, "dx_longitude": &json_lon,
"mode": "PKT", "mode": "PKT",
"mode_type": "DATA", "mode_type": "DATA",
"mode_source": "SPOT", "mode_source": "SPOT",
"time": SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs(), "time": SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs(),
}); });
let client = reqwest::blocking::Client::new(); let client = reqwest::blocking::Client::new();
let res = client.post(spothole_url) let res = client.post(spothole_url)
.json(&packet) .json(&packet)
.send(); .send();
println!("sent to {} = {}", spothole_url, packet); println!("sent to {} = {}", spothole_url, packet);
println!("res = {res:?}"); println!("res = {res:?}");
// If it's filtered, send a note about that
} else if summary == "UI" && cli.spothole && cli.filter.contains(&source) {
println!("Filter {:?} applied, not spotted", cli.filter)
} }
// Send UDP // Send UDP