Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sub-GHz: Fix GPS "Latitute" typo, switch to "Lat" and "Lon" in .sub files #246

Merged
merged 5 commits into from
Oct 8, 2024
Merged

Sub-GHz: Fix GPS "Latitute" typo, switch to "Lat" and "Lon" in .sub files #246

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
410fedb
fix(subghz): s/Latitute/Latitude/
m7i-org Oct 6, 2024
f562492
feat(subghz): using Lat,Lon with fallback to older values
m7i-org Oct 7, 2024
27d6e11
Merge remote-tracking branch 'mntm/dev' into fix/fix-typo
Willy-JL Oct 8, 2024
be79c38
Some speedup and fix fallbacks
Willy-JL Oct 8, 2024
bcb1a94
Update changelog
Willy-JL Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions applications/main/subghz/subghz_i.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ bool subghz_key_load(SubGhz* subghz, const char* file_path, bool show_dialog) {
SubGhzLoadKeyState load_key_state = SubGhzLoadKeyStateParseErr;
FuriString* temp_str = furi_string_alloc();
uint32_t temp_data32;
float temp_lat = NAN; // NAN or 0.0?? because 0.0 is valid value
//Using NAN in order to avoid the null island problem
float temp_lat = NAN;
float temp_lon = NAN;
SubGhzTx can_tx = SubGhzTxUnsupported;

Expand Down Expand Up @@ -156,15 +157,30 @@ bool subghz_key_load(SubGhz* subghz, const char* file_path, bool show_dialog) {
}
}

//Load latitute and longitude if present, strict mode to avoid reading the whole file twice
//Load latitude and longitude if present
//Strict mode to fail if next key doesn't match, instead of reading whole file
flipper_format_set_strict_mode(fff_data_file, true);
if(!flipper_format_read_float(fff_data_file, "Latitute", (float*)&temp_lat, 1) ||
!flipper_format_read_float(fff_data_file, "Longitude", (float*)&temp_lon, 1)) {
FURI_LOG_W(TAG, "Missing Latitude and Longitude (optional)");
flipper_format_rewind(fff_data_file);
//Save position and seek instead of rewinding whole file when keys aren't found
Stream* fff_raw_stream = flipper_format_get_raw_stream(fff_data_file);
size_t pos_before_lat_lon = stream_tell(fff_raw_stream);
if(!flipper_format_read_float(fff_data_file, "Lat", (float*)&temp_lat, 1) ||
!flipper_format_read_float(fff_data_file, "Lon", (float*)&temp_lon, 1)) {
stream_seek(fff_raw_stream, pos_before_lat_lon, StreamOffsetFromStart);
//Fallback to older keys "Latitute", "Longitude"
if(!flipper_format_read_float(fff_data_file, "Latitute", (float*)&temp_lat, 1) ||
!flipper_format_read_float(fff_data_file, "Longitude", (float*)&temp_lon, 1)) {
FURI_LOG_W(TAG, "Missing Lat and Lon (optional)");
stream_seek(fff_raw_stream, pos_before_lat_lon, StreamOffsetFromStart);
}
}
flipper_format_set_strict_mode(fff_data_file, false);

//Avoid null island when reading
if(temp_lat == 0.0 && temp_lon == 0.0) {
temp_lat = NAN;
temp_lon = NAN;
}

size_t preset_index =
subghz_setting_get_inx_preset_by_name(setting, furi_string_get_cstr(temp_str));
subghz_txrx_set_preset(
Expand Down
8 changes: 4 additions & 4 deletions lib/subghz/blocks/generic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ SubGhzProtocolStatus subghz_block_generic_serialize_common(
break;
}
}
if(!flipper_format_write_float(flipper_format, "Latitute", &preset->latitude, 1)) {
FURI_LOG_E(TAG, "Unable to add Latitute");
if(!flipper_format_write_float(flipper_format, "Lat", &preset->latitude, 1)) {
FURI_LOG_E(TAG, "Unable to add Lat");
res = SubGhzProtocolStatusErrorParserLatitude;
break;
}
if(!flipper_format_write_float(flipper_format, "Longitude", &preset->longitude, 1)) {
FURI_LOG_E(TAG, "Unable to add Longitude");
if(!flipper_format_write_float(flipper_format, "Lon", &preset->longitude, 1)) {
FURI_LOG_E(TAG, "Unable to add Lon");
res = SubGhzProtocolStatusErrorParserLongitude;
break;
}
Expand Down
Loading