diff --git a/interface/package-lock.json b/interface/package-lock.json index 52d725e92..614945f32 100644 --- a/interface/package-lock.json +++ b/interface/package-lock.json @@ -11,8 +11,8 @@ "@emotion/react": "^11.10.5", "@emotion/styled": "^11.10.5", "@msgpack/msgpack": "^2.8.0", - "@mui/icons-material": "^5.10.14", - "@mui/material": "^5.10.14", + "@mui/icons-material": "^5.10.15", + "@mui/material": "^5.10.15", "@table-library/react-table-library": "4.0.23", "@types/lodash": "^4.14.190", "@types/node": "^18.11.9", @@ -20,7 +20,7 @@ "@types/react-dom": "^18.0.9", "@types/react-router-dom": "^5.3.3", "async-validator": "^4.2.5", - "axios": "^1.1.3", + "axios": "^1.2.0", "http-proxy-middleware": "^2.0.6", "jwt-decode": "^3.1.2", "lodash": "^4.17.21", diff --git a/mock-api/package-lock.json b/mock-api/package-lock.json index eec37582f..9775fcb87 100644 --- a/mock-api/package-lock.json +++ b/mock-api/package-lock.json @@ -43,9 +43,9 @@ } }, "node_modules/anymatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -906,9 +906,9 @@ } }, "node_modules/simple-update-notifier": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz", - "integrity": "sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz", + "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==", "dependencies": { "semver": "~7.0.0" }, @@ -1056,9 +1056,9 @@ } }, "anymatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "requires": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -1687,9 +1687,9 @@ } }, "simple-update-notifier": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz", - "integrity": "sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz", + "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==", "requires": { "semver": "~7.0.0" }, diff --git a/src/default_settings.h b/src/default_settings.h index 70145925d..64692d7cc 100644 --- a/src/default_settings.h +++ b/src/default_settings.h @@ -132,7 +132,7 @@ #endif #ifndef EMSESP_DEFAULT_PHY_TYPE -#define EMSESP_DEFAULT_PHY_TYPE 0 // No Ethernet, just Wifi +#define EMSESP_DEFAULT_PHY_TYPE 0 // No Ethernet, just Wifi. PHY_type::PHY_TYPE_NONE, #endif // MQTT diff --git a/src/web/WebSettingsService.cpp b/src/web/WebSettingsService.cpp index 6c0a99dbe..9f6987927 100644 --- a/src/web/WebSettingsService.cpp +++ b/src/web/WebSettingsService.cpp @@ -89,18 +89,32 @@ StateUpdateResult WebSettings::update(JsonObject & root, WebSettings & settings) #elif CONFIG_IDF_TARGET_ESP32 settings.board_profile = root["board_profile"] | EMSESP_DEFAULT_BOARD_PROFILE; #endif + settings.board_profile = "S32"; + if (!System::load_board_profile(data, settings.board_profile.c_str())) { +// unknown, check for ethernet, use default E32/S32 +// data is led, dallas, rx, tx, pbutton, phy, eth_power, eth_addr, eth_clock #ifndef EMSESP_STANDALONE - // unknown, check for ethernet, use default E32/S32 if (ETH.begin(1, 16, 23, 18, ETH_PHY_LAN8720)) { - data = {2, 4, 5, 17, 33, PHY_type::PHY_TYPE_LAN8720, 16, 1, 0}; // BBQKees Gateway E32 + // BBQKees Gateway E32 + data = {EMSESP_DEFAULT_LED_GPIO, 4, 5, 17, 33, PHY_type::PHY_TYPE_LAN8720, 16, 1, 0}; settings.board_profile = "E32"; - } else { - data = {2, 18, 23, 5, 0, PHY_type::PHY_TYPE_NONE, 0, 0, 0}; // BBQKees Gateway S32 + } else +#endif + { + // BBQKees Gateway S32 + data = {EMSESP_DEFAULT_LED_GPIO, + EMSESP_DEFAULT_DALLAS_GPIO, + EMSESP_DEFAULT_RX_GPIO, + EMSESP_DEFAULT_TX_GPIO, + EMSESP_DEFAULT_PBUTTON_GPIO, + EMSESP_DEFAULT_PHY_TYPE, + 0, + 0, + 0}; settings.board_profile = "S32"; } EMSESP::logger().info("No board profile found. Re-setting to %s", settings.board_profile.c_str()); -#endif } else { EMSESP::logger().info("Loading board profile %s", settings.board_profile.c_str()); }