Merge remote-tracking branch 'tbnobody/OpenDTU/master'

.github/workflows/build.yml

@@ -98,16 +98,13 @@ jobs:
       - name: Copy boot_app0.bin
         run: cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin .pio/build/${{ matrix.environment }}/boot_app0.bin
 
-      - name: Copy bootloader_dio_40m.bin
-        run: cp ~/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/bin/bootloader_dio_40m.bin .pio/build/${{ matrix.environment }}/bootloader_dio_40m.bin
-
       - uses: actions/upload-artifact@v3
         with:
           name: opendtu-${{ matrix.environment }}
           path: |
             .pio/build/${{ matrix.environment }}/opendtu-${{ matrix.environment }}.bin
             .pio/build/${{ matrix.environment }}/partitions.bin
-            .pio/build/${{ matrix.environment }}/bootloader_dio_40m.bin
+            .pio/build/${{ matrix.environment }}/bootloader.bin
             .pio/build/${{ matrix.environment }}/boot_app0.bin
 
       - uses: actions/upload-artifact@v3

README.md

@@ -185,7 +185,7 @@ Use a ESP32 flash tool of your choice (see next chapter) and flash the `.bin` fi
 
 | Address  | File                   |
 | ---------| ---------------------- |
-| 0x1000   | bootloader_dio_40m.bin |
+| 0x1000   | bootloader.bin         |
 | 0x8000   | partitions.bin         |
 | 0xe000   | boot_app0.bin          |
 | 0x10000  | opendtu-*.bin          |
@@ -196,7 +196,7 @@ For further updates you can just use the web interface and upload the `opendtu-*
 ```
 esptool.py --port /dev/ttyUSB0 --chip esp32 --before default_reset --after hard_reset \
   write_flash --flash_mode dout --flash_freq 40m --flash_size detect \
-  0x1000 bootloader_dio_40m.bin \
+  0x1000 bootloader.bin \
   0x8000 partitions.bin \
   0xe000 boot_app0.bin \
   0x10000 opendtu-generic.bin
@@ -220,7 +220,8 @@ Users report that [ESP_Flasher](https://github.com/Jason2866/ESP_Flasher/release
 * After the initial flashing of the microcontroller, an Access Point called "OpenDTU-*" is opened. The default password is "openDTU42".
 * Use a web browser to open the address [http://192.168.4.1](http://192.168.4.1)
 * Navigate to Settings --> Network Settings and enter your WiFi credentials. The username to access the config menu is "admin" and the password the same as for accessing the Access Point (default: "openDTU42").
-* OpenDTU then simultaneously connects to your WiFi AP with this credentials. Navigate to Info --> Network and look into section "Network Interface (Station)" for the IP address received via DHCP.
+* OpenDTU then simultaneously connects to your WiFi AP with these credentials. Navigate to Info --> Network and look into section "Network Interface (Station)" for the IP address received via DHCP.
+* If your WiFi AP uses an allow-list for MAC-addresses, please be aware that the ESP32 has two different MAC addresses for its AP and client modes, they are also listed at Info --> Network.
 * When OpenDTU is connected to a configured WiFI AP, the "OpenDTU-*" Access Point is closed after 3 minutes.
 * OpenDTU needs access to a working NTP server to get the current date & time. Both are sent to the inverter with each request. Default NTP server is pool.ntp.org. If your network has different requirements please change accordingly (Settings --> NTP Settings).
 * Add your inverter in the inverter settings (Settings --> Inverter Settings)

platformio.ini

@@ -15,7 +15,7 @@ extra_configs =
 
 [env]
 framework = arduino
-platform = espressif32@>=5.2.0
+platform = espressif32@>=5.3.0
 
 build_flags =
     -D=${PIOENV}

webapp/package.json

@@ -23,19 +23,19 @@
   "devDependencies": {
     "@rushstack/eslint-patch": "^1.2.0",
     "@types/bootstrap": "^5.2.6",
-    "@types/node": "^18.11.17",
+    "@types/node": "^18.11.18",
     "@types/spark-md5": "^3.0.2",
     "@vitejs/plugin-vue": "^4.0.0",
     "@vue/eslint-config-typescript": "^11.0.2",
     "@vue/tsconfig": "^0.1.3",
-    "eslint": "^8.30.0",
+    "eslint": "^8.31.0",
     "eslint-plugin-vue": "^9.8.0",
     "npm-run-all": "^4.1.5",
     "sass": "^1.57.1",
     "typescript": "^4.9.4",
     "vite": "^4.0.3",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-css-injected-by-js": "^2.2.0",
-    "vue-tsc": "^1.0.18"
+    "vue-tsc": "^1.0.19"
   }
 }

webapp/src/locales/de.json

@@ -354,7 +354,7 @@
         "RepeatPassword": "Passwort wiederholen:",
         "PasswordHint": "<b>Hinweis:</b> Das Administrator-Passwort wird für den Zugriff auf die Webschnittstelle (Benutzer 'admin'), aber auch für die Verbindung mit dem Gerät im AP-Modus verwendet. Es muss 8..64 Zeichen lang sein.",
         "Permissions": "Berechtigungen",
-        "ReadOnly": "Nur-Lese-Zugriff auf die Weboberfläche zulassen",
+        "ReadOnly": "Nur-Lese-Zugriff auf die Weboberfläche ohne Passwort zulassen",
         "Save": "@:dtuadmin.Save"
     },
     "ntpadmin": {
@@ -512,6 +512,6 @@
         "TimeSync": "Die Uhr wurde noch nicht synchronisiert. Ohne eine korrekt eingestellte Uhr werden keine Anfragen an den Wechselrichter gesendet. Dies ist kurz nach dem Start normal. Nach einer längeren Laufzeit (>1 Minute) bedeutet es jedoch, dass der NTP-Server nicht erreichbar ist.",
         "TimeSyncLink": "Bitte überprüfen Sie Ihre Zeiteinstellungen.",
         "DefaultPassword": "Sie verwenden das Standardpasswort für die Weboberfläche und den Notfall Access Point. Dies ist potenziell unsicher.",
-        "DefaultPasswortLink": "Bitte ändern Sie das Passwort."
+        "DefaultPasswordLink": "Bitte ändern Sie das Passwort."
     }
 }

webapp/src/locales/en.json

@@ -354,7 +354,7 @@
         "RepeatPassword": "Repeat Password:",
         "PasswordHint": "<b>Hint:</b> The administrator password is used to access this web interface (user 'admin'), but also to connect to the device when in AP mode. It must be 8..64 characters.",
         "Permissions": "Permissions",
-        "ReadOnly": "Allow readonly access to web interface",
+        "ReadOnly": "Allow readonly access to web interface without password",
         "Save": "@:dtuadmin.Save"
     },
     "ntpadmin": {
@@ -512,6 +512,6 @@
         "TimeSync": "The clock has not yet been synchronised. Without a correctly set clock, no requests are made to the inverter. This is normal shortly after the start. However, after a longer runtime (>1 minute), it indicates that the NTP server is not accessible.",
         "TimeSyncLink": "Please check your time settings.",
         "DefaultPassword": "You are using the default password for the web interface and the emergency access point. This is potentially insecure.",
-        "DefaultPasswortLink": "Please change the password."
+        "DefaultPasswordLink": "Please change the password."
     }
 }