Merge pull request #56 from rfvermut/feat/0_11_builds

feat(firmware): add build for 0.11, identical to 0.10
ClemensElflein · Feb 26, 2023 · a8e95e7 · a8e95e7
2 parents 5377a0a + 5574851
commit a8e95e7
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 24 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -48,12 +48,21 @@ jobs:
       - name: Copy Artifacts
         run: |
           mkdir artifacts
+          
+          mkdir ./artifacts/0_11_X_MPU9250
+          cp Firmware/LowLevel/.pio/build/0_11_X_MPU9250/firmware.elf ./artifacts/0_11_X_MPU9250
+          cp Firmware/LowLevel/.pio/build/0_11_X_MPU9250/firmware.uf2 ./artifacts/0_11_X_MPU9250
+          mkdir ./artifacts/0_11_X_WT901
+          cp Firmware/LowLevel/.pio/build/0_11_X_WT901/firmware.elf ./artifacts/0_11_X_WT901
+          cp Firmware/LowLevel/.pio/build/0_11_X_WT901/firmware.uf2 ./artifacts/0_11_X_WT901
+          
           mkdir ./artifacts/0_10_X_MPU9250
           cp Firmware/LowLevel/.pio/build/0_10_X_MPU9250/firmware.elf ./artifacts/0_10_X_MPU9250
           cp Firmware/LowLevel/.pio/build/0_10_X_MPU9250/firmware.uf2 ./artifacts/0_10_X_MPU9250
           mkdir ./artifacts/0_10_X_WT901
           cp Firmware/LowLevel/.pio/build/0_10_X_WT901/firmware.elf ./artifacts/0_10_X_WT901
           cp Firmware/LowLevel/.pio/build/0_10_X_WT901/firmware.uf2 ./artifacts/0_10_X_WT901
+          
           mkdir ./artifacts/0_9_X_MPU9250
           cp Firmware/LowLevel/.pio/build/0_9_X_MPU9250/firmware.elf ./artifacts/0_9_X_MPU9250
           cp Firmware/LowLevel/.pio/build/0_9_X_MPU9250/firmware.uf2 ./artifacts/0_9_X_MPU9250

diff --git a/Firmware/LowLevel/platformio.ini b/Firmware/LowLevel/platformio.ini
@@ -10,8 +10,8 @@
 
 [common]
 ; common sources here
-default_src_filter = +<*> 
-    -<src/imu/>
+default_src_filter = +<*>
+                     -<src/imu/>
 
 [env]
 platform = https://github.com/maxgerhardt/platform-raspberrypi.git
@@ -43,46 +43,58 @@ debug_build_flags = -O0 -g -ggdb
 build_src_filter = +<*> -<.git/> -<.svn/> -<imu/*> -<soundsystem.cpp>
 
 
+[env:0_11_X_MPU9250]
+lib_ignore = JY901_SERIAL,JY901_I2C
+lib_deps = ${env.lib_deps}
+           bolderflight/Bolder Flight Systems MPU9250@^1.0.2
+           powerbroker2/DFPlayerMini_Fast@^1.2.4
+build_src_filter = ${env.build_src_filter} +<imu/MPU9250/> +<soundsystem.cpp>
+build_flags = ${env.build_flags} -DHW_0_11_X -DENABLE_SOUND_MODULE
+
+[env:0_11_X_WT901]
+build_src_filter = ${env.build_src_filter} +<imu/WT901_I2C/> +<soundsystem.cpp>
+lib_ignore = JY901_SERIAL
+lib_deps = ${env.lib_deps}
+           powerbroker2/DFPlayerMini_Fast@^1.2.4
+           JY901_I2C
+build_flags = ${env.build_flags} -DWT901_I2C -DHW_0_11_X -DENABLE_SOUND_MODULE
 
 
 [env:0_10_X_MPU9250]
 lib_ignore = JY901_SERIAL,JY901_I2C
-lib_deps = ${env.lib_deps} 
-    bolderflight/Bolder Flight Systems MPU9250@^1.0.2
-    powerbroker2/DFPlayerMini_Fast@^1.2.4
+lib_deps = ${env.lib_deps}
+           bolderflight/Bolder Flight Systems MPU9250@^1.0.2
+           powerbroker2/DFPlayerMini_Fast@^1.2.4
 build_src_filter = ${env.build_src_filter} +<imu/MPU9250/> +<soundsystem.cpp>
 build_flags = ${env.build_flags} -DHW_0_10_X -DENABLE_SOUND_MODULE
 
 [env:0_10_X_WT901]
 build_src_filter = ${env.build_src_filter} +<imu/WT901_I2C/> +<soundsystem.cpp>
 lib_ignore = JY901_SERIAL
-lib_deps = ${env.lib_deps} 
-    powerbroker2/DFPlayerMini_Fast@^1.2.4
-    JY901_I2C
-build_flags =
-    ${env.build_flags} -DWT901_I2C -DHW_0_10_X -DENABLE_SOUND_MODULE
+lib_deps = ${env.lib_deps}
+           powerbroker2/DFPlayerMini_Fast@^1.2.4
+           JY901_I2C
+build_flags = ${env.build_flags} -DWT901_I2C -DHW_0_10_X -DENABLE_SOUND_MODULE
 
 [env:0_9_X_MPU9250]
 lib_ignore = JY901_SERIAL,JY901_I2C
-lib_deps = ${env.lib_deps} 
-    bolderflight/Bolder Flight Systems MPU9250@^1.0.2
-    powerbroker2/DFPlayerMini_Fast@^1.2.4
+lib_deps = ${env.lib_deps}
+           bolderflight/Bolder Flight Systems MPU9250@^1.0.2
+           powerbroker2/DFPlayerMini_Fast@^1.2.4
 build_src_filter = ${env.build_src_filter} +<imu/MPU9250/> +<soundsystem.cpp>
 build_flags = ${env.build_flags} -DHW_0_9_X -DENABLE_SOUND_MODULE
 
 [env:0_9_X_WT901_INSTEAD_OF_SOUND]
 lib_ignore = JY901_I2C
 build_src_filter = ${env.build_src_filter} +<imu/WT901_SERIAL/>
-lib_deps = ${env.lib_deps} 
-    JY901_SERIAL
-build_flags =
-    ${env.build_flags} -DWT901_INSTEAD_OF_SOUND -DHW_0_9_X
+lib_deps = ${env.lib_deps}
+           JY901_SERIAL
+build_flags = ${env.build_flags} -DWT901_INSTEAD_OF_SOUND -DHW_0_9_X
 
 [env:0_9_X_WT901]
 lib_ignore = JY901_I2C
 build_src_filter = ${env.build_src_filter} +<imu/WT901_SERIAL/> +<soundsystem.cpp>
-lib_deps = ${env.lib_deps} 
-    JY901_SERIAL
-    powerbroker2/DFPlayerMini_Fast@^1.2.4	
-build_flags =
-    ${env.build_flags} -DWT901 -DHW_0_9_X -DENABLE_SOUND_MODULE
+lib_deps = ${env.lib_deps}
+           JY901_SERIAL
+           powerbroker2/DFPlayerMini_Fast@^1.2.4
+build_flags = ${env.build_flags} -DWT901 -DHW_0_9_X -DENABLE_SOUND_MODULE
diff --git a/Firmware/LowLevel/src/pins.h b/Firmware/LowLevel/src/pins.h
@@ -43,7 +43,7 @@
     #define PIN_WT901_RX 16
 #endif
 
-#elif HW_0_10_X
+#elif HW_0_10_X || HW_0_11_X
 #define WT901_WIRE Wire
 
 #define PIN_WT901_SDA 8
@@ -82,4 +82,4 @@
 
 #else
 #error No hardware version defined
-#endif
+#endif