Fixed merge conflicts

.github/workflows/release.yml

@@ -4,6 +4,12 @@ on:
   push:
     tags:
       - 'v*.*.*'
+      - 'beta-*'
+
+permissions:
+  contents: write
+  pages: write
+  id-token: write
 
 permissions:
   contents: write
@@ -78,6 +84,7 @@ jobs:
       with:
         name: Release v${{ steps.release_tag.outputs.tag }}
         generateReleaseNotes: true
+        allowUpdates: true
 
     - name: Build esp8266 firmware
       run: pio run -e esp8266

.gitignore

@@ -22,3 +22,4 @@ node_modules
 localazy-keys.json
 localazy/language
 .env
+/.env

platformio.ini

@@ -143,26 +143,26 @@ lib_deps = ${esp32.lib_deps}
 lib_ignore = ${common.lib_ignore}
 extra_scripts = ${common.extra_scripts}
 
-[env:esp32s2dev]
-platform = espressif32
-board = esp32-s2-kaluga-1
-framework = arduino
-upload_port = /dev/cu.usbmodem01
-monitor_port = /dev/cu.usbmodem01
-upload_speed = 921600
-monitor_speed = 115200
-board_build.flash_mode = dio
-board_build.flash_size = 4MB
-build_flags = 
-    ${common.build_flags} 
-    -D AMS_REMOTE_DEBUG=1
-    -D AMS_CLOUD=1
-    -D AMS_KMP=1
-    -D ZMART_CHARGE=1
-    -L precompiled/esp32s2
-    -lKmpTalker
-lib_ldf_mode = off
-lib_compat_mode = off
-lib_deps = ${esp32.lib_deps}
-lib_ignore = ${common.lib_ignore}
-extra_scripts = ${common.extra_scripts}
+; [env:esp32s2dev]
+; platform = espressif32
+; board = esp32-s2-kaluga-1
+; framework = arduino
+; upload_port = /dev/cu.usbmodem01
+; monitor_port = /dev/cu.usbmodem01
+; upload_speed = 921600
+; monitor_speed = 115200
+; board_build.flash_mode = dio
+; board_build.flash_size = 4MB
+; build_flags = 
+;     ${common.build_flags} 
+;     -D AMS_REMOTE_DEBUG=1
+;     -D AMS_CLOUD=1
+;     -D AMS_KMP=1
+;     -D ZMART_CHARGE=1
+;     -L precompiled/esp32s2
+;     -lKmpTalker
+; lib_ldf_mode = off
+; lib_compat_mode = off
+; lib_deps = ${esp32.lib_deps}
+; lib_ignore = ${common.lib_ignore}
+; extra_scripts = ${common.extra_scripts}