Merge branch 'master' into o-codes

Author: Paciente8159

.github/workflows/pio-build.yaml

@@ -19,14 +19,14 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Cache pip
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
         restore-keys: |
           ${{ runner.os }}-pip-
     - name: Cache PlatformIO
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.platformio
         key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
@@ -43,7 +43,7 @@ jobs:
     - name: Zip binaries
       run: zip ${{matrix.boards}}.zip .pio/build/${{matrix.boards}}/firmware.*
     - name: Upload binaries
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
           name: ${{matrix.boards}}
           path: ./${{matrix.boards}}.zip

.github/workflows/pio-release.yaml

@@ -33,14 +33,14 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Cache pip
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
         restore-keys: |
           ${{ runner.os }}-pip-
     - name: Cache PlatformIO
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.platformio
         key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
@@ -57,7 +57,7 @@ jobs:
     - name: Zip binaries
       run: zip ${{matrix.boards}}.zip .pio/build/${{matrix.boards}}/firmware.*
     - name: Upload binaries
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
           name: ${{matrix.boards}}
           path: ./${{matrix.boards}}.zip

.github/workflows/pio-test.yaml

@@ -12,14 +12,14 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Cache pip
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
         restore-keys: |
           ${{ runner.os }}-pip-
     - name: Cache PlatformIO
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.platformio
         key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}

platformio.ini

@@ -21,24 +21,17 @@ extra_configs =
   uCNC/src/hal/boards/esp32/esp32.ini
   uCNC/src/hal/boards/rp2040/rp2040.ini
   uCNC/src/hal/mcus/virtual/virtual.ini
-	uCNC/webconfig.ini
 
 [env]
 framework = arduino
 monitor_speed = 115200
 monitor_eol = LF
 monitor_echo = yes
 monitor_filters = colorize, time
-; board = ${webconfig.board}
 extra_scripts =
 	pre:ucnc_modules.py
-custom_ucnc_modules_url = ${webconfig.custom_ucnc_modules_url}
-custom_ucnc_modules = ${webconfig.custom_ucnc_modules}
-build_flags = 
-	${webconfig.build_flags}
-	; add your custom build flags
-lib_deps = 
-	${webconfig.lib_deps}
-	; add you custom library dependencies
-
-
+;user config
+custom_ucnc_modules_url =
+custom_ucnc_modules =
+lib_deps =
+build_flags =

uCNC/src/hal/boards/avr/avr.ini

@@ -74,4 +74,5 @@ build_flags = ${common_avr.build_flags} -D BOARD=\"src/hal/boards/avr/boardmap_m
 
 [env:AVR-CUSTOM]
 extends = common_avr
+build_flags = ${common_avr.build_flags} -DMCU=MCU_CUSTOM
 board = ${env.board}

uCNC/src/hal/boards/esp32/esp32.ini

@@ -50,6 +50,7 @@ build_flags = ${common_esp32.build_flags} -D BOARD=BOARDMAP_FILE("src/hal/boards
 
 [env:ESP32-CUSTOM]
 extends = common_esp32
+build_flags = ${common_esp32.build_flags} -DMCU=MCU_CUSTOM
 board = ${env.board}
 
 #################

uCNC/src/hal/boards/lpc176x/lpc176x.ini

@@ -30,4 +30,5 @@ build_flags = ${common_lpc176x.build_flags} -D BOARD=\"src/hal/boards/lpc176x/bo
 
 [env:LPC176X-CUSTOM]
 extends = common_lpc176x
+build_flags = ${common_lpc176x.build_flags} -DMCU=MCU_CUSTOM
 board = ${env.board}

uCNC/src/hal/boards/rp2040/rp2040.ini

@@ -62,4 +62,5 @@ build_flags = -D BOARD=\"src/hal/boards/rp2040/boardmap_rpi_pico_w.h\" -D ENABLE
 
 [env:RP2040-CUSTOM]
 extends = common_rp2040
+build_flags = ${common_rp2040.build_flags} -DMCU=MCU_CUSTOM
 board = ${env.board}

uCNC/src/hal/boards/samd21/samd21.ini

@@ -35,4 +35,5 @@ board_upload.offset_address = 0x00004000
 
 [env:SAMD21-CUSTOM]
 extends = common_samd21
+build_flags = ${common_samd21.build_flags} -DMCU=MCU_CUSTOM
 board = ${env.board}

uCNC/src/hal/boards/stm32/stm32.ini

@@ -5,8 +5,8 @@
 [common_stm32]
 platform = platformio/ststm32@^17.5.0
 ; debug with st-link
-upload_protocol = cmsis-dap
-debug_tool = cmsis-dap
+; upload_protocol = cmsis-dap
+; debug_tool = cmsis-dap
 debug_speed = 100
 platform_packages = platformio/tool-openocd
 debug_build_flags = -Og -g3 -ggdb3 -gdwarf-2
@@ -97,4 +97,5 @@ build_flags = ${common_stm32.build_flags} -D BOARD=\"src/hal/boards/stm32/boardm
 
 [env:STM32-CUSTOM]
 extends = common_stm32
+build_flags = ${common_stm32.build_flags} -DMCU=MCU_CUSTOM
 board = ${env.board}