Skip to content

GNSS: Add gnssCmdUpdateConstellations called by menuCommands #745

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

Open
wants to merge 4 commits into
base: release_candidate
Choose a base branch
from
+292 −260
Open

GNSS: Add gnssCmdUpdateConstellations called by menuCommands #745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ac6cbb
makefile: Update to build with new and updated libraries, add BT patch
LeeLeahy2 Oct 4, 2025
4d4cf9c
Settings: Add afterSetCmd field to command table
LeeLeahy2 Oct 4, 2025
b64114b
menuCommands: Call afterSetCmd function
LeeLeahy2 Oct 4, 2025
4cf000c
GNSS: Add gnssCmdUpdateConstellations called by menuCommands
LeeLeahy2 Oct 4, 2025
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
3 changes: 3 additions & 0 deletions Firmware/RTK_Everywhere/GNSS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,4 +396,7 @@ class GNSS
virtual void update();
};

// Update the constellations following a set command
bool gnssCmdUpdateConstellations(int commandIndex);

#endif // __GNSS_H__
11 changes: 11 additions & 0 deletions Firmware/RTK_Everywhere/GNSS.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,3 +427,14 @@ void gnssFirmwareRemoveUpdateFile(const char *filename)
}

//----------------------------------------
// Update the constellations following a set command
//----------------------------------------
bool gnssCmdUpdateConstellations(int commandIndex)
{
if (gnss == nullptr)
return false;

return gnss->setConstellations();
}

//----------------------------------------
7 changes: 6 additions & 1 deletion Firmware/RTK_Everywhere/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ PARTITION_SRC_PATH=../$(PARTITION_CSV_FILE).csv
PATCH_SRC_PATH=Patch/

# Linux patch destination paths
BT_LIB_DEST_PATH=$(ESP_IDF_PATH)/$(ESP_IDF_VERSION)/esp32/lib/
MBED_LIB_DEST_PATH=$(ESP_IDF_PATH)/$(ESP_IDF_VERSION)/esp32/lib/
NET_EVENT_PATCH_PATH=$(HOME_BOARD_PATH)/hardware/esp32/$(ESP_CORE_VERSION)/libraries/Network/src/
PARTITION_DST_PATH=$(HOME_BOARD_PATH)/hardware/esp32/$(ESP_CORE_VERSION)/tools/partitions/$(PARTITION_CSV_FILE).csv
Expand Down Expand Up @@ -165,9 +166,13 @@ $(MBED_LIB_DEST_PATH)libmbedcrypto.a: $(PATCH_SRC_PATH)libmbedcrypto.a
$(MBED_LIB_DEST_PATH)libmbedx509.a: $(PATCH_SRC_PATH)libmbedx509.a
$(COPY) $< $@

$(BT_LIB_DEST_PATH)libbt.a: $(PATCH_SRC_PATH)libbt.a
$(COPY) $< $@

.PHONY: patch

patch:
touch $(PATCH_SRC_PATH)libbt.a
touch $(PATCH_SRC_PATH)libmbedtls.a
touch $(PATCH_SRC_PATH)libmbedtls_2.a
touch $(PATCH_SRC_PATH)libmbedcrypto.a
Expand All @@ -189,7 +194,7 @@ form.h: AP-Config/* AP-Config/src/* AP-Config/src/fonts/*
python ../Tools/index_html_zipper.py AP-Config/index.html form.h
python ../Tools/main_js_zipper.py AP-Config/src/main.js form.h

$(RTK_BIN_PATH): RTK_Everywhere.ino *.ino *.h makefile $(PARTITION_DST_PATH) $(MBED_LIB_DEST_PATH)libmbedtls.a $(MBED_LIB_DEST_PATH)libmbedtls_2.a $(MBED_LIB_DEST_PATH)libmbedcrypto.a $(MBED_LIB_DEST_PATH)libmbedx509.a
$(RTK_BIN_PATH): RTK_Everywhere.ino *.ino *.h makefile $(PARTITION_DST_PATH) $(MBED_LIB_DEST_PATH)libmbedtls.a $(MBED_LIB_DEST_PATH)libmbedtls_2.a $(MBED_LIB_DEST_PATH)libmbedcrypto.a $(MBED_LIB_DEST_PATH)libmbedx509.a $(BT_LIB_DEST_PATH)libbt.a
$(CLEAR)
arduino-cli compile --fqbn "esp32:esp32:esp32":DebugLevel=$(DEBUG_LEVEL),PSRAM=enabled RTK_Everywhere.ino \
--warnings default \
Expand Down
24 changes: 17 additions & 7 deletions Firmware/RTK_Everywhere/menuCommands.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ void commandSendAllInterfaces(char *rxData)
// errors

// With debug=debug, 788 characters are printed locally that slow down the interface enough to avoid errors,
// or 68.4ms at 115200
// or 68.4ms at 115200
// With debug=error, can we delay 70ms after every line print and avoid errors? Yes! Works
// well. 50ms is good, 25ms works sometimes without error, 5 is bad.

Expand Down Expand Up @@ -1282,13 +1282,23 @@ SettingValueResponse updateSettingWithValue(bool inCommands, const char *setting
}
break;
}
}

// Done when the setting is found
if (knownSetting == true && settingIsString == true)
return (SETTING_KNOWN_STRING);
else if (knownSetting == true)
return (SETTING_KNOWN);
// Done when the setting is found
if (knownSetting == true && settingIsString == true)
{
// Determine if extra work needs to be done when the setting changes
if (rtkSettingsEntries[i].afterSetCmd)
rtkSettingsEntries[i].afterSetCmd(i);
return (SETTING_KNOWN_STRING);
}
else if (knownSetting == true)
{
// Determine if extra work needs to be done when the setting changes
if (rtkSettingsEntries[i].afterSetCmd)
rtkSettingsEntries[i].afterSetCmd(i);
return (SETTING_KNOWN);
}
}

if (strcmp(settingName, "fixedLatText") == 0)
{
Expand Down
Loading