Feature/milight mqtt

.github/workflows/build_esp32c3m.yml

@@ -0,0 +1,71 @@
+name: Build ESP32C3M Firmware
+
+on:
+  push:
+    branches: [ ver4dev ]
+    paths:
+      - 'platformio.ini'
+      - 'src/**'
+      - 'include/**'
+      - 'lib/**'
+      - 'data_*/**'
+      - 'bin/**'
+      - 'tools/**'
+      - 'PrepareProject.py'
+      - '.github/workflows/build_esp32c3m.yml'
+  pull_request:
+    branches: [ ver4dev ]
+    paths:
+      - 'platformio.ini'
+      - 'src/**'
+      - 'include/**'
+      - 'lib/**'
+      - 'data_*/**'
+      - 'bin/**'
+      - 'tools/**'
+      - 'PrepareProject.py'
+      - '.github/workflows/build_esp32c3m.yml'
+  workflow_dispatch:
+
+env:
+  BOARD: esp32c3m_4mb
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+
+      - name: Install PlatformIO
+        run: |
+          python -m pip install --upgrade pip
+          pip install platformio
+
+      - name: Prepare project
+        run: python ./PrepareProject.py -b ${BOARD}
+
+      - name: Build firmware
+        run: platformio run -e ${BOARD}
+
+      - name: Build filesystem image
+        run: platformio run -e ${BOARD} -t buildfs --disable-auto-clean
+
+      - name: Collect artifacts
+        run: |
+          mkdir -p artifacts/${BOARD}
+          find .pio/build/${BOARD} -maxdepth 1 -type f -name '*.bin' -exec cp {} artifacts/${BOARD} \;
+          if [ -f build_${BOARD}.log ]; then cp build_${BOARD}.log artifacts/${BOARD}/; fi
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${BOARD}-firmware-${{ github.run_number }}
+          path: artifacts/${BOARD}

.github/workflows/build_iotm.yml

@@ -0,0 +1,52 @@
+env:
+  BOARDS: '["esp8266_4mb", "esp8266_16mb", "esp32_4mb3f", "esp32c3m_4mb", "esp32s2_4mb", "esp32s3_16mb"]'
+
+name: Build Firmware
+
+on:
+  workflow_dispatch:
+
+jobs:
+  generate-matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set_matrix.outputs.json }}
+    steps:
+      - name: Prepare matrix JSON Object
+        id: set_matrix
+        run: echo "json={\"board\":${{ env.BOARDS }}}" >> $GITHUB_OUTPUT
+
+  build:
+    needs: [ generate-matrix ]
+    runs-on: ubuntu-latest
+    strategy:
+      matrix: ${{ fromJSON(needs.generate-matrix.outputs.matrix) }}
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        ref: 'ver4dev'
+    - name: Run PrepareProject.py -b ${{ matrix.board }}
+      run: python3 ./PrepareProject.py -b ${{ matrix.board }}
+    - name: Set up Python
+      uses: actions/setup-python@v4
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install platformio
+    - name: Run PlatformIO
+      if: always()
+      run: platformio run 
+    - name: Build FS
+      if: always()
+      run: platformio run -t buildfs --disable-auto-clean
+    - name: Rearrange Artifacts
+      run: |
+        mkdir -p artifacts/${{ matrix.board }}
+        find .pio/build/${{ matrix.board }} -name "*.bin" -exec mv {} artifacts/${{ matrix.board }} \;
+      working-directory: ${{ github.workspace }}
+    - name: Attach artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: firmware-${{ matrix.board }}-${{ github.run_number }}
+        path: artifacts/${{ matrix.board }}

PrepareProject.py

@@ -13,6 +13,8 @@
 # python PrepareProject.py --profile <ИмяФайла>
 # python PrepareProject.py -p <ИмяФайла>
 # 
+# Используя параметры -b или --board <board_name> можно уточнить для какой платы нужно подготовить проект
+# 
 # поддерживаемые контроллеры (профили):
 # esp8266_4mb
 # esp8266_16mb
@@ -41,7 +43,22 @@ def printHelp():
         PrepareProject.py
         -p --profile <file.json_in_root_folder>
         -u --update
-        -h --help''')
+        -h --help
+        -b --board <board_name>''')
+    with open('myProfile.json', "r", encoding='utf-8') as read_file:
+        profJson = json.load(read_file)  
+    print ('')
+    print ('Choose a board from the list:')
+    # print(profJson['projectProp']['platformio']['comments_default_envs'])
+    print ('        ', end='')
+    cnt = 0
+    for envs in profJson['projectProp']['platformio']['envs']:
+        if cnt == 5:
+            cnt = 0
+            print('')
+            print('        ', end='')
+        print(envs['name'] + ', ', end='')
+        cnt = cnt + 1
 
 
 def updateModulesInProfile(profJson):
@@ -68,10 +85,11 @@ def updateModulesInProfile(profJson):
 
 update = False              # признак необходимости обновить список модулей
 profile = 'myProfile.json'  # имя профиля. Будет заменено из консоли, если указано при старте
-
+selectDevice = ''           # имя платы для которой хотим собрать, если её указали к командной строке -b <board>
+
 argv = sys.argv[1:]
 try:
-    opts, args = getopt.getopt(argv, 'hp:u', ['help', 'profile=', 'update'])
+    opts, args = getopt.getopt(argv, 'hp:ub:', ['help', 'profile=', 'update', 'board='])
 except getopt.GetoptError:
     print('Ошибка обработки параметров!')
     printHelp()
@@ -82,10 +100,14 @@ def updateModulesInProfile(profJson):
         printHelp()
         sys.exit()
     elif opt in ("-p", "--profile"):
+        print('Загрузка профиля из файла:' + arg)
         profile = arg
     elif opt in ("-u", "--update"):
+        print('Создание новой конфигурации по исходным файлам!')
         update = True
-
+    elif opt in ("-b", "--board"):
+        print('Создание профиля для платы:' + arg)
+        selectDevice = arg
 
 if Path(profile).is_file():
     # подтягиваем уже существующий профиль
@@ -121,9 +143,17 @@ def updateModulesInProfile(profJson):
     with open(profile, "w", encoding='utf-8') as write_file:
         json.dump(profJson, write_file, ensure_ascii=False, indent=4, sort_keys=False)
 
-
-# определяем какое устройство используется в профиле
-deviceName = profJson['projectProp']['platformio']['default_envs']  
+deviceName = ''
+if selectDevice == '':
+    # определяем какое устройство используется в профиле
+    deviceName = profJson['projectProp']['platformio']['default_envs']  
+else:
+    for envs in profJson['projectProp']['platformio']['envs']:
+        if envs['name'] == selectDevice:
+            deviceName = selectDevice
+    if deviceName == '':
+        deviceName = profJson['projectProp']['platformio']['default_envs'] 
+        print(f"\x1b[1;31;31m Board ", selectDevice, " not found in ",profile,"!!! Use ",deviceName,"  \x1b[0m")
 
 # заполняем папку /data файлами прошивки в зависимости от устройства
 if deviceName == 'esp8266_1mb_ota' or deviceName == 'esp8285_1mb_ota' or deviceName == 'esp8266_2mb_ota': 
@@ -134,7 +164,8 @@ def updateModulesInProfile(profJson):
 deviceType = 'esp32*'
 if not 'esp32' in deviceName:
     deviceType = 'esp82*'
-
+if 'bk72' in deviceName:
+    deviceType = 'bk72*'
 # генерируем файлы проекта на основе подготовленного профиля
 # заполняем конфигурационный файл прошивки параметрами из профиля
 with open("data_svelte/settings.json", "r", encoding='utf-8') as read_file:
@@ -151,7 +182,8 @@ def updateModulesInProfile(profJson):
 # параллельно собираем необходимые активным модулям библиотеки для включения в компиляцию для текущего типа устройства (esp8266_4m, esp32_4mb, esp8266_1m, esp8266_1m_ota) 
 activeModulesName = []  # список имен активных модулей
 allLibs = ""            # подборка всех библиотек необходимых модулям для дальнейшей записи в конфигурацию platformio
-itemsCount = 1;
+allDefs = "\n"            # для каждого модуля создаем глобальный define
+itemsCount = 1
 includeDirs = ""        # подборка путей ко всем модулям для дальнейшей записи в конфигурацию platformio
 itemsJson = json.loads('[{"name": "Выберите элемент", "num": 0}]')
 for section, modules in profJson['modules'].items():
@@ -160,6 +192,8 @@ def updateModulesInProfile(profJson):
         if module['active']:
             with open(module['path'] + "/modinfo.json", "r", encoding='utf-8') as read_file:
                 moduleJson = json.load(read_file)
+                if 'moduleDefines' in moduleJson['about']:
+                    allDefs = allDefs + "\n".join("-D" + d for d in moduleJson['about']['moduleDefines'])
                 if deviceName in moduleJson['usedLibs']:   # проверяем поддерживает ли модуль текущее устройство
                     if not 'exclude' in moduleJson['usedLibs'][deviceName]: # смотрим не нужно ли исключить данный модуль из указанной платы deviceName
                         activeModulesName.append(moduleJson['about']['moduleName'])     # запоминаем имена для использования на след шагах
@@ -170,6 +204,7 @@ def updateModulesInProfile(profJson):
                             configItemsJson['num'] = itemsCount
                             configItemsJson['name'] = str(itemsCount) + ". " + configItemsJson['name']
                             itemsCount = itemsCount + 1
+                            configItemsJson['moduleName'] = moduleJson['about']['moduleName']
                             itemsJson.append(configItemsJson)    
                 else: # В первую очередь ищем по имени deviceName, чтобы для данной платы можно было уточнить либы. Если не нашли плату по имени в usedLibs пробуем найти её по типу deviceType
                     if deviceType in moduleJson['usedLibs']:   # проверяем поддерживает ли модуль текущее устройство
@@ -179,9 +214,10 @@ def updateModulesInProfile(profJson):
                             allLibs = allLibs + "\n" + libPath       
                         for configItemsJson in moduleJson['configItem']:
                             configItemsJson['num'] = itemsCount
-                            configItemsJson['name'] = str(itemsCount) + ". " + configItemsJson['name']
-                            itemsCount = itemsCount + 1
-                            itemsJson.append(configItemsJson)    
+                            configItemsJson['name'] = str(itemsCount) + ". " + configItemsJson['name'] 
+                            itemsCount = itemsCount + 1 
+                            itemsJson.append(configItemsJson)
+                            configItemsJson['moduleName'] = moduleJson['about']['moduleName']     
 
 with open("data_svelte/items.json", "w", encoding='utf-8') as write_file:
     json.dump(itemsJson, write_file, ensure_ascii=False, indent=4, sort_keys=False)
@@ -192,12 +228,12 @@ def updateModulesInProfile(profJson):
 allAPI_exec = ""
 for activModuleName in activeModulesName:
     allAPI_head = allAPI_head + "\nvoid* getAPI_" + activModuleName + "(String subtype, String params);"
-    allAPI_exec = allAPI_exec + "\nif ((tmpAPI = getAPI_" + activModuleName + "(subtype, params)) != nullptr) return tmpAPI;"
+    allAPI_exec = allAPI_exec + "\nif ((tmpAPI = getAPI_" + activModuleName + "(subtype, params)) != nullptr) foundAPI = tmpAPI;"
 apicpp = '#include "ESPConfiguration.h"\n'
 apicpp = apicpp + allAPI_head
-apicpp = apicpp + '\n\nvoid* getAPI(String subtype, String params) {\nvoid* tmpAPI;'
+apicpp = apicpp + '\n\nvoid* getAPI(String subtype, String params) {\nvoid* tmpAPI; void* foundAPI = nullptr;'
 apicpp = apicpp + allAPI_exec
-apicpp = apicpp + '\nreturn nullptr;\n}'
+apicpp = apicpp + '\nreturn foundAPI;\n}'
 with open('src/modules/API.cpp', 'w') as f:
     f.write(apicpp)
 
@@ -217,7 +253,10 @@ def updateModulesInProfile(profJson):
 config.read("platformio.ini")
 config["env:" + deviceName + "_fromitems"]["lib_deps"] = allLibs
 config["env:" + deviceName + "_fromitems"]["build_src_filter"] = includeDirs
+config["env:" + deviceName + "_fromitems"]["build_flags"] = allDefs
 config["platformio"]["default_envs"] = deviceName
+if "${env:" + deviceName + "_fromitems.build_flags}" not in config["env:" + deviceName]["build_flags"]:
+    config["env:" + deviceName]["build_flags"] += "\n${env:" + deviceName + "_fromitems.build_flags}"
 # config["platformio"]["data_dir"] = profJson['projectProp']['platformio']['data_dir']
 with open("platformio.ini", 'w') as configFile:
     config.write(configFile)
@@ -251,4 +290,4 @@ def updateModulesInProfile(profJson):
 
 # print(f"\x1b[1;32;41m Операция завершена. \x1b[0m")
 
-
+

PrepareServer.py

@@ -26,8 +26,8 @@ def copyFileIfExist(fileName, deviceName):
 deviceName = config["platformio"]["default_envs"]
 
 homeDir = os.path.expanduser('~')
-os.system(homeDir + "\.platformio\penv\Scripts\pio run")
-os.system(homeDir + "\.platformio\penv\Scripts\pio run -t buildfs --disable-auto-clean")
+os.system(homeDir + "/.platformio/penv/Scripts/pio run")
+os.system(homeDir + "/.platformio/penv/Scripts/pio run -t buildfs --disable-auto-clean")
 
 if copyFileIfExist("firmware.bin", deviceName) and copyFileIfExist("littlefs.bin", deviceName):
     copyFileIfExist("partitions.bin", deviceName)

build_esp32c3m.log

@@ -0,0 +1,59 @@
+Processing esp32c3m_4mb (framework: arduino; board: lolin_c3_mini; platform: espressif32 @6.6.0)
+--------------------------------------------------------------------------------
+Verbose mode can be enabled via `-v, --verbose` option
+PLATFORMIO_DIRC:\Users\IT-TehNika\.platformio
+���� �������, ��! C:\Users\IT-TehNika\.platformio\packages\framework-arduinoespressif32\libraries\WiFi\src\WiFiClient.cpp
+CONFIGURATION: https://docs.platformio.org/page/boards/espressif32/lolin_c3_mini.html
+PLATFORM: Espressif 32 (6.6.0) > WEMOS LOLIN C3 Mini
+HARDWARE: ESP32C3 160MHz, 320KB RAM, 4MB Flash
+DEBUG: Current (esp-prog) External (cmsis-dap, esp-bridge, esp-builtin, esp-prog, iot-bus-jtag, jlink, minimodule, olimex-arm-usb-ocd, olimex-arm-usb-ocd-h, olimex-arm-usb-tiny-h, olimex-jtag-tiny, tumpa)
+PACKAGES: 
+ - framework-arduinoespressif32 @ 3.20014.231204 (2.0.14) 
+ - tool-esptoolpy @ 1.40501.0 (4.5.1) 
+ - toolchain-riscv32-esp @ 8.4.0+2021r2-patch5
+LDF: Library Dependency Finder -> https://bit.ly/configure-pio-ldf
+LDF Modes: Finder ~ chain, Compatibility ~ soft
+Found 67 compatible libraries
+Scanning dependencies...
+Dependency Graph
+|-- ArduinoJson @ 6.18.0
+|-- PubSubClient @ 2.8.0
+|-- EncButton @ 2.0.0
+|-- TM16xx LEDs and Buttons @ 0.7.2503+sha.ab716f4
+|-- Adafruit GFX Library @ 1.12.4+sha.e4df4cc
+|-- Adafruit BusIO @ 1.17.4
+|-- Adafruit BME280 Library @ 2.3.0
+|-- Adafruit BMP280 Library @ 2.6.8
+|-- DHT sensor library for ESPx @ 1.19.0
+|-- MAX6675 library @ 1.1.2
+|-- WS2812FX @ 1.4.5
+|-- dscKeybusInterface @ 3.0.0+sha.ce12e1c
+|-- AHTxx @ 1.2.0+sha.701814c
+|-- DallasTemperature @ 4.0.5
+|-- EspSoftwareSerial @ 8.1.0
+|-- Wire @ 2.0.0
+|-- OneWire @ 2.3.8
+|-- iarduino RTC (���� ��������� �������) @ 2.0.0
+|-- ESP32 Async UDP @ 2.0.0
+|-- LittleFS @ 2.0.0
+|-- FS @ 2.0.0
+|-- SPIFFS @ 2.0.0
+|-- WiFi @ 2.0.0
+|-- HTTPClient @ 2.0.0
+|-- HTTPUpdate @ 2.0.0
+|-- TickerScheduler
+|-- Update @ 2.0.0
+|-- WebServer @ 2.0.0
+|-- WebSockets @ 2.3.7
+Building in release mode
+Retrieving maximum program size .pio\build\esp32c3m_4mb\firmware.elf
+Checking size .pio\build\esp32c3m_4mb\firmware.elf
+Advanced Memory Usage is available via "PlatformIO Home > Project Inspect"
+RAM:   [=         ]  13.1% (used 42884 bytes from 327680 bytes)
+Flash: [========  ]  77.7% (used 1221944 bytes from 1572864 bytes)
+========================= [SUCCESS] Took 68.72 seconds =========================
+
+Environment    Status    Duration
+-------------  --------  ------------
+esp32c3m_4mb   SUCCESS   00:01:08.724
+========================= 1 succeeded in 00:01:08.724 =========================