Merge pull request #1514 from MichaelDvP/dev

ethernet with arduino_3.0, sort translations alphabetical
emsesp · Dec 18, 2023 · 08c5fd8 · 08c5fd8
2 parents a28cdaa + 215c4e4
commit 08c5fd8
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 13 deletions.
diff --git a/interface/src/SignIn.tsx b/interface/src/SignIn.tsx
@@ -143,6 +143,10 @@ const SignIn: FC = () => {
             <img src={PLflag} style={{ width: 16, verticalAlign: 'middle' }} />
             &nbsp;PL
           </MenuItem>
+          <MenuItem key="sk" value="sk">
+            <img src={SKflag} style={{ width: 16, verticalAlign: 'middle' }} />
+            &nbsp;SK
+          </MenuItem>
           <MenuItem key="sv" value="sv">
             <img src={SVflag} style={{ width: 16, verticalAlign: 'middle' }} />
             &nbsp;SV
@@ -151,10 +155,6 @@ const SignIn: FC = () => {
             <img src={TRflag} style={{ width: 16, verticalAlign: 'middle' }} />
             &nbsp;TR
           </MenuItem>
-          <MenuItem key="sk" value="sk">
-            <img src={SKflag} style={{ width: 16, verticalAlign: 'middle' }} />
-            &nbsp;SK
-          </MenuItem>
         </TextField>
 
         <Box display="flex" flexDirection="column" alignItems="center">

diff --git a/interface/src/components/layout/LayoutAuthMenu.tsx b/interface/src/components/layout/LayoutAuthMenu.tsx
@@ -102,6 +102,10 @@ const LayoutAuthMenu: FC = () => {
           <img src={PLflag} style={{ width: 16, verticalAlign: 'middle' }} />
           &nbsp;PL
         </MenuItem>
+        <MenuItem key="sk" value="sk">
+          <img src={SKflag} style={{ width: 16, verticalAlign: 'middle' }} />
+          &nbsp;SK
+        </MenuItem>
         <MenuItem key="sv" value="sv">
           <img src={SVflag} style={{ width: 16, verticalAlign: 'middle' }} />
           &nbsp;SV
@@ -110,10 +114,6 @@ const LayoutAuthMenu: FC = () => {
           <img src={TRflag} style={{ width: 16, verticalAlign: 'middle' }} />
           &nbsp;TR
         </MenuItem>
-        <MenuItem key="sk" value="sk">
-          <img src={SKflag} style={{ width: 16, verticalAlign: 'middle' }} />
-          &nbsp;SK
-        </MenuItem>
       </TextField>
 
       <IconButton

diff --git a/interface/src/project/SettingsApplication.tsx b/interface/src/project/SettingsApplication.tsx
@@ -384,9 +384,9 @@ const SettingsApplication: FC = () => {
             <MenuItem value="nl">Nederlands (NL)</MenuItem>
             <MenuItem value="no">Norsk (NO)</MenuItem>
             <MenuItem value="pl">Polski (PL)</MenuItem>
+            <MenuItem value="sk">Slovenčina (SK)</MenuItem>
             <MenuItem value="sv">Svenska (SV)</MenuItem>
             <MenuItem value="tr">Türk (TR)</MenuItem>
-            <MenuItem value="sk">Slovenčina (SK)</MenuItem>
           </TextField>
         </Grid>
         {data.led_gpio !== 0 && (

diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp
@@ -2420,7 +2420,7 @@ bool Boiler::set_ww_mode(const char * value, const int8_t id) {
     if (is_received(EMS_TYPE_UBAParameterWWPlus)) {
         if (Helpers::value2enum(value, set, FL_(enum_comfort1))) {
             write_command(EMS_TYPE_UBAParameterWWPlus, 13, comfort[set], EMS_TYPE_UBAParameterWWPlus);
-            write_command(0x05, 70, set ? 0xAA : 0x55); //
+            write_command(0x05, 70, set == 0 ? 0xAA : 0x55); //
             return true;
         }
     } else {

diff --git a/src/system.cpp b/src/system.cpp
@@ -730,7 +730,11 @@ void System::network_init(bool refresh) {
     //  ETH_CLOCK_GPIO17_OUT = 3  RMII clock output from GPIO17, for 50hz inverted clock
     auto clock_mode = (eth_clock_mode_t)eth_clock_mode_;
 
-    eth_present_ = ETH.begin((eth_phy_type_t)phy_addr, power, mdc, mdio, type, clock_mode);
+#if ESP_ARDUINO_VERSION_MAJOR < 3
+    eth_present_ = ETH.begin(phy_addr, power, mdc, mdio, type, clock_mode);
+#else
+    eth_present_ = ETH.begin(type, phy_addr, mdc, mdio, power, clock_mode);
+#endif
 #endif
 }
 

diff --git a/src/web/WebSettingsService.cpp b/src/web/WebSettingsService.cpp
@@ -109,13 +109,21 @@ StateUpdateResult WebSettings::update(JsonObject & root, WebSettings & settings)
         if (!System::load_board_profile(data, settings.board_profile.c_str())) {
 #if CONFIG_IDF_TARGET_ESP32 && !defined(EMSESP_STANDALONE)
             if (settings.board_profile == "") { // empty: new test
-                if (ETH.begin((eth_phy_type_t)1, 16, 23, 18, ETH_PHY_LAN8720, ETH_CLOCK_GPIO0_IN)) {
+#if ESP_ARDUINO_VERSION_MAJOR < 3
+                if (ETH.begin(1, 16, 23, 18, ETH_PHY_LAN8720, ETH_CLOCK_GPIO0_IN)) {
+#else
+                if (ETH.begin(ETH_PHY_LAN8720, 1, 23, 18, 16, ETH_CLOCK_GPIO0_IN)) {
+#endif
                     EMSESP::nvs_.putString("boot", "E32");
                 } else {
                     EMSESP::nvs_.putString("boot", "Test");
                 }
             } else if (settings.board_profile == "Test") {
-                if (ETH.begin((eth_phy_type_t)0, 15, 23, 18, ETH_PHY_LAN8720, ETH_CLOCK_GPIO0_OUT)) {
+#if ESP_ARDUINO_VERSION_MAJOR < 3
+                if (ETH.begin(0, 15, 23, 18, ETH_PHY_LAN8720, ETH_CLOCK_GPIO0_OUT)) {
+#else
+                if (ETH.begin(ETH_PHY_LAN8720, 0, 23, 18, 15, ETH_CLOCK_GPIO0_OUT)) {
+#endif
                     EMSESP::nvs_.putString("boot", "E32V2");
                 } else {
                     EMSESP::nvs_.putString("boot", "S32");