j.marmier/stw24
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make simulator compile

Browse Source
This commit is contained in:
Jasper Blanckenburg
2023-05-23 02:51:40 +02:00
parent 2347b738c5
commit 5a56ce394f
9 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Core/Inc/util.h
View File

@ -4,8 +4,14 @@
// This is wacky preprocessor magic that allows us to count the number of
// members of an enum. Unfortunately, it doesn't work with enum classes, so we
// have to use C-style enums.
// The preprocessor magic is so wacky we have to prevent GCC from failing with a
// -Werror=pedantic when compiling the simulator
#pragma GCC diagnostic ignored "-Wpedantic"
#define CountedEnum(NAME, TYPE, ...) \
typedef enum { __VA_ARGS__ } NAME; \
static const size_t NAME##_COUNT = sizeof((int[]){__VA_ARGS__}) / sizeof(int);
static const size_t NAME##_COUNT = \
sizeof(__extension__(int[]){__VA_ARGS__}) / sizeof(int);
#endif // INC_UTIL_H

4
Core/Src/leds.c
View File

@ -230,7 +230,7 @@ void led_anim_blinker(uint8_t r, uint8_t g, uint8_t b,
colors[i][1] = g * i / (brightness_steps - 1);
colors[i][2] = b * i / (brightness_steps - 1);
}
size_t simultaneous_leds = brightness_steps / next_led_steps;
int32_t simultaneous_leds = brightness_steps / next_led_steps;
if (simultaneous_leds * next_led_steps != brightness_steps) {
simultaneous_leds++;
}
@ -239,7 +239,7 @@ void led_anim_blinker(uint8_t r, uint8_t g, uint8_t b,
int32_t furthest = 0;
size_t color_idx = 0;
while (furthest < 5 + simultaneous_leds) {
for (size_t offset = 0; offset < simultaneous_leds; offset++) {
for (int32_t offset = 0; offset < simultaneous_leds; offset++) {
int32_t diff = furthest - offset;
size_t led_color_idx = color_idx + offset * next_led_steps;
if (diff < 0 || diff > 4 || led_color_idx >= brightness_steps) {