andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 00:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2435 from proddy/dev

Browse Source 
minor changes
This commit is contained in:
Proddy
2025-03-02 09:46:55 +01:00
committed by GitHub
parent 16cf16616e 43d2fa1f00
commit 00c2b5992c
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
interface/src/app/main/Devices.tsx
View File

@@ -276,6 +276,7 @@ const Devices = () => {
const resetDeviceSelect = () => { const resetDeviceSelect = () => {
device_select.fns.onRemoveAll(); device_select.fns.onRemoveAll();
setSearch('');
}; };
const escFunction = useCallback( const escFunction = useCallback(

2
src/core/system.cpp
View File

@@ -2154,7 +2154,7 @@ bool System::command_read(const char * value, const int8_t id) {
// set the system status code - SYSTEM_STATUS in system.h // set the system status code - SYSTEM_STATUS in system.h
void System::systemStatus(uint8_t status_code) { void System::systemStatus(uint8_t status_code) {
systemStatus_ = status_code; systemStatus_ = status_code;
LOG_DEBUG("Setting System status code %d", status_code); // LOG_DEBUG("Setting System status code %d", status_code);
} }
uint8_t System::systemStatus() { uint8_t System::systemStatus() {

6
src/test/test.cpp
View File

@@ -288,8 +288,8 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
} }
// extract params // extract params
int8_t id1 = -1; int16_t id1 = -1;
int8_t id2 = -1; int16_t id2 = -1;
if (!id1_s.empty()) { if (!id1_s.empty()) {
if (id1_s[0] == '0' && id1_s[1] == 'x') { if (id1_s[0] == '0' && id1_s[1] == 'x') {
id1 = Helpers::hextoint(id1_s.c_str()); id1 = Helpers::hextoint(id1_s.c_str());
@@ -307,7 +307,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
shell.printfln("Usage: test add <device_id> <product_id>"); shell.printfln("Usage: test add <device_id> <product_id>");
return; return;
} }
shell.printfln("Testing Adding a device (product_id %d), with all values...", id2); shell.printfln("Testing adding a device (deviceID 0x%02X, product_id %d), with all values...", id1, id2);
test("add", id1, id2); test("add", id1, id2);
shell.invoke_command("show devices"); shell.invoke_command("show devices");
ok = true; ok = true;

13
src/web/WebSettingsService.cpp
View File

@@ -193,17 +193,16 @@ StateUpdateResult WebSettings::update(JsonObject root, WebSettings & settings) {
#elif CONFIG_IDF_TARGET_ESP32S3 #elif CONFIG_IDF_TARGET_ESP32S3
settings.board_profile = "S32S3"; // BBQKees Gateway S3 settings.board_profile = "S32S3"; // BBQKees Gateway S3
#endif #endif
// apply the new board profile setting // apply the new board profile setting
System::load_board_profile(data, settings.board_profile.c_str()); System::load_board_profile(data, settings.board_profile.c_str());
} }
if (old_board_profile != settings.board_profile) { if (org_board_profile != settings.board_profile) {
// see if need to override the set board profile (e.g. forced by NVS boot string) if (org_board_profile.isEmpty()) {
EMSESP::logger().info("Setting new Board profile %s (was %s)", settings.board_profile.c_str(), old_board_profile.c_str()); EMSESP::logger().info("Setting board profile to %s", settings.board_profile.c_str());
} else if (org_board_profile != settings.board_profile) { } else {
// EMSESP::logger().info("Board profile set to %s", settings.board_profile.c_str()); EMSESP::logger().info("Setting board profile to %s (was %s)", settings.board_profile.c_str(), org_board_profile.c_str());
EMSESP::logger().info("Setting new Board profile %s (was %s)", settings.board_profile.c_str(), org_board_profile.c_str()); }
} }
int prev; int prev;