Skip to content

Commit 63a52c9

Browse files
ApehaengerApehaenger
committed
Merge main
1 parent dd050da commit 63a52c9

File tree

8 files changed

+862
-1035
lines changed

8 files changed

+862
-1035
lines changed

‎.github/workflows/ci.yaml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -116,27 +116,6 @@ jobs:
116116
cp Firmware/LowLevel/.pio/build/0_9_X_WT901_INSTEAD_OF_SOUND/firmware.elf ./artifacts/0_9_X_WT901_INSTEAD_OF_SOUND
117117
cp Firmware/LowLevel/.pio/build/0_9_X_WT901_INSTEAD_OF_SOUND/firmware.uf2 ./artifacts/0_9_X_WT901_INSTEAD_OF_SOUND
118118
119-
mkdir ./artifacts/0_13_X_IGNORE_CHARGING_CURRENT
120-
cp Firmware/LowLevel/.pio/build/0_13_X_IGNORE_CHARGING_CURRENT/firmware.elf ./artifacts/0_13_X_IGNORE_CHARGING_CURRENT
121-
cp Firmware/LowLevel/.pio/build/0_13_X_IGNORE_CHARGING_CURRENT/firmware.uf2 ./artifacts/0_13_X_IGNORE_CHARGING_CURRENT
122-
123-
mkdir ./artifacts/0_12_X_IGNORE_CHARGING_CURRENT
124-
cp Firmware/LowLevel/.pio/build/0_12_X_IGNORE_CHARGING_CURRENT/firmware.elf ./artifacts/0_12_X_IGNORE_CHARGING_CURRENT
125-
cp Firmware/LowLevel/.pio/build/0_12_X_IGNORE_CHARGING_CURRENT/firmware.uf2 ./artifacts/0_12_X_IGNORE_CHARGING_CURRENT
126-
127-
mkdir ./artifacts/0_11_X_WT901_IGNORE_CHARGING_CURRENT
128-
cp Firmware/LowLevel/.pio/build/0_11_X_WT901_IGNORE_CHARGING_CURRENT/firmware.elf ./artifacts/0_11_X_WT901_IGNORE_CHARGING_CURRENT
129-
cp Firmware/LowLevel/.pio/build/0_11_X_WT901_IGNORE_CHARGING_CURRENT/firmware.uf2 ./artifacts/0_11_X_WT901_IGNORE_CHARGING_CURRENT
130-
131-
mkdir ./artifacts/0_10_X_WT901_IGNORE_CHARGING_CURRENT
132-
cp Firmware/LowLevel/.pio/build/0_10_X_WT901_IGNORE_CHARGING_CURRENT/firmware.elf ./artifacts/0_10_X_WT901_IGNORE_CHARGING_CURRENT
133-
cp Firmware/LowLevel/.pio/build/0_10_X_WT901_IGNORE_CHARGING_CURRENT/firmware.uf2 ./artifacts/0_10_X_WT901_IGNORE_CHARGING_CURRENT
134-
135-
mkdir ./artifacts/0_9_X_WT901_IGNORE_CHARGING_CURRENT
136-
cp Firmware/LowLevel/.pio/build/0_9_X_WT901_IGNORE_CHARGING_CURRENT/firmware.elf ./artifacts/0_9_X_WT901_IGNORE_CHARGING_CURRENT
137-
cp Firmware/LowLevel/.pio/build/0_9_X_WT901_IGNORE_CHARGING_CURRENT/firmware.uf2 ./artifacts/0_9_X_WT901_IGNORE_CHARGING_CURRENT
138-
139-
140119
- name: Upload Artifacts
141120
uses: actions/upload-artifact@v4
142121
with:

‎Firmware/LowLevel/include/debug.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#define _DEBUG_H_
1818

1919
// Define to stream debugging messages via USB
20-
//#define USB_DEBUG
20+
#define USB_DEBUG
2121
#define DEBUG_PREFIX "" // You may define a debug prefix string
2222

2323
#ifdef USB_DEBUG
@@ -29,13 +29,15 @@
2929
DEBUG_SERIAL.begin(b); \
3030
while (!DEBUG_SERIAL) \
3131
;
32+
#define DEBUG_PRINTLN(str) DEBUG_SERIAL.println(str)
3233
#define DEBUG_PRINTF(fmt, ...) \
3334
do \
3435
{ \
3536
DEBUG_SERIAL.printf(DEBUG_PREFIX fmt, ##__VA_ARGS__); \
3637
} while (0)
3738
#else
3839
#define DEBUG_BEGIN(b)
40+
#define DEBUG_PRINTLN(str)
3941
#define DEBUG_PRINTF(fmt, ...)
4042
#endif
4143

‎Firmware/LowLevel/include/nv_config.h

Lines changed: 0 additions & 78 deletions
This file was deleted.

‎Firmware/LowLevel/platformio.ini

Lines changed: 4 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,17 @@ platform = https://github.com/maxgerhardt/platform-raspberrypi.git
1818
board = pico
1919
framework = arduino
2020
board_build.core = earlephilhower
21+
board_build.filesystem_size = 64k
2122

2223
lib_deps =
2324
Wire
2425
SPI
2526
FastCRC
27+
LittleFS
2628
bakercp/PacketSerial@^1.4.0
2729
powerbroker2/FireTimer@^1.0.5
2830
https://github.com/ClemensElflein/NeoPixelConnect.git
29-
31+
etlcpp/Embedded Template Library @ ^20.39.4
3032

3133
debug_tool = custom
3234
debug_init_break =
@@ -44,23 +46,14 @@ build_src_filter = +<*> -<.git/> -<.svn/> -<imu/*>
4446

4547
[sound]
4648
lib_deps = makuna/DFPlayer Mini Mp3 by Makuna@^1.2.3
47-
etlcpp/Embedded Template Library @ ^20.39.4
4849

4950
[env:0_13_X]
5051
lib_ignore = JY901_SERIAL,JY901_I2C
5152
lib_deps = ${env.lib_deps}
5253
${sound.lib_deps}
5354
stm32duino/STM32duino LSM6DSO@^2.0.3
5455
build_src_filter = ${env.build_src_filter} +<imu/LSM6DSO/>
55-
build_flags = ${env.build_flags} -DHW_0_13_X -DENABLE_SOUND_MODULE
56-
57-
[env:0_13_X_IGNORE_CHARGING_CURRENT]
58-
lib_ignore = JY901_SERIAL,JY901_I2C
59-
lib_deps = ${env.lib_deps}
60-
${sound.lib_deps}
61-
stm32duino/STM32duino LSM6DSO@^2.0.3
62-
build_src_filter = ${env.build_src_filter} +<imu/LSM6DSO/>
63-
build_flags = ${env.build_flags} -DHW_0_13_X -DIGNORE_CHARGING_CURRENT -DENABLE_SOUND_MODULE
56+
build_flags = ${env.build_flags} -DHW_0_13_X
6457

6558
[env:0_12_X]
6659
lib_ignore = JY901_SERIAL,JY901_I2C
@@ -71,15 +64,6 @@ lib_deps = ${env.lib_deps}
7164
build_src_filter = ${env.build_src_filter} +<imu/LSM6DSO/>
7265
build_flags = ${env.build_flags} -DHW_0_12_X -DENABLE_SOUND_MODULE
7366

74-
[env:0_12_X_IGNORE_CHARGING_CURRENT]
75-
lib_ignore = JY901_SERIAL,JY901_I2C
76-
lib_deps = ${env.lib_deps}
77-
${sound.lib_deps}
78-
stm32duino/STM32duino LSM6DSO@^2.0.3
79-
jpiat/PioSPI@^0.0.1
80-
build_src_filter = ${env.build_src_filter} +<imu/LSM6DSO/>
81-
build_flags = ${env.build_flags} -DHW_0_12_X -DENABLE_SOUND_MODULE -DIGNORE_CHARGING_CURRENT
82-
8367

8468
[env:0_11_X_MPU9250]
8569
lib_ignore = JY901_SERIAL,JY901_I2C
@@ -97,14 +81,6 @@ lib_deps = ${env.lib_deps}
9781
JY901_I2C
9882
build_flags = ${env.build_flags} -DWT901_I2C -DHW_0_11_X -DENABLE_SOUND_MODULE
9983

100-
[env:0_11_X_WT901_IGNORE_CHARGING_CURRENT]
101-
build_src_filter = ${env.build_src_filter} +<imu/WT901_I2C/>
102-
lib_ignore = JY901_SERIAL
103-
lib_deps = ${env.lib_deps}
104-
${sound.lib_deps}
105-
JY901_I2C
106-
build_flags = ${env.build_flags} -DWT901_I2C -DHW_0_11_X -DENABLE_SOUND_MODULE -DIGNORE_CHARGING_CURRENT
107-
10884

10985
[env:0_10_X_MPU9250]
11086
lib_ignore = JY901_SERIAL,JY901_I2C
@@ -122,13 +98,6 @@ lib_deps = ${env.lib_deps}
12298
JY901_I2C
12399
build_flags = ${env.build_flags} -DWT901_I2C -DHW_0_10_X -DENABLE_SOUND_MODULE
124100

125-
[env:0_10_X_WT901_IGNORE_CHARGING_CURRENT]
126-
build_src_filter = ${env.build_src_filter} +<imu/WT901_I2C/>
127-
lib_ignore = JY901_SERIAL
128-
lib_deps = ${env.lib_deps}
129-
${sound.lib_deps}
130-
JY901_I2C
131-
build_flags = ${env.build_flags} -DWT901_I2C -DHW_0_10_X -DENABLE_SOUND_MODULE -DIGNORE_CHARGING_CURRENT
132101

133102
[env:0_9_X_MPU9250]
134103
lib_ignore = JY901_SERIAL,JY901_I2C
@@ -145,15 +114,6 @@ lib_deps = ${env.lib_deps}
145114
JY901_SERIAL
146115
build_flags = ${env.build_flags} -DWT901_INSTEAD_OF_SOUND -DHW_0_9_X
147116

148-
149-
[env:0_9_X_WT901_IGNORE_CHARGING_CURRENT]
150-
lib_ignore = JY901_I2C
151-
build_src_filter = ${env.build_src_filter} +<imu/WT901_SERIAL/>
152-
lib_deps = ${env.lib_deps}
153-
${sound.lib_deps}
154-
JY901_SERIAL
155-
build_flags = ${env.build_flags} -DWT901 -DHW_0_9_X -DENABLE_SOUND_MODULE -DIGNORE_CHARGING_CURRENT
156-
157117
[env:0_9_X_WT901]
158118
lib_ignore = JY901_I2C
159119
build_src_filter = ${env.build_src_filter} +<imu/WT901_SERIAL/>

0 commit comments

Comments
 (0)