diff options
| author | Selene ToyKeeper | 2023-07-20 20:30:18 -0600 |
|---|---|---|
| committer | Selene ToyKeeper | 2023-07-20 20:30:18 -0600 |
| commit | ff0c77fea64e3b0b27cb3a3ca2e323a1581a6bb9 (patch) | |
| tree | 087ea6ce3745c8b1bc30c76aa1baa948cc648736 /hw | |
| parent | converted Emisar D4 and BLF Q8 to multi-channel, (diff) | |
| download | anduril-ff0c77fea64e3b0b27cb3a3ca2e323a1581a6bb9.tar.gz anduril-ff0c77fea64e3b0b27cb3a3ca2e323a1581a6bb9.tar.bz2 anduril-ff0c77fea64e3b0b27cb3a3ca2e323a1581a6bb9.zip | |
fixed D4Sv2 (using new refactor)
Diffstat (limited to '')
| -rw-r--r-- | hwdef-emisar-d4sv2.c | 13 | ||||
| -rw-r--r-- | hwdef-emisar-d4sv2.h | 35 |
2 files changed, 22 insertions, 26 deletions
diff --git a/hwdef-emisar-d4sv2.c b/hwdef-emisar-d4sv2.c index d67efb5..c19054e 100644 --- a/hwdef-emisar-d4sv2.c +++ b/hwdef-emisar-d4sv2.c @@ -6,6 +6,19 @@ #include "chan-rgbaux.c" +void set_level_main(uint8_t level); +bool gradual_tick_main(uint8_t gt); + + +Channel channels[] = { + { // main LEDs + .set_level = set_level_main, + .gradual_tick = gradual_tick_main + }, + RGB_AUX_CHANNELS +}; + + // single set of LEDs with 3 stacked power channels, DDFET+3+1 void set_level_main(uint8_t level) { if (level == 0) { diff --git a/hwdef-emisar-d4sv2.h b/hwdef-emisar-d4sv2.h index 0607c24..11d1abb 100644 --- a/hwdef-emisar-d4sv2.h +++ b/hwdef-emisar-d4sv2.h @@ -38,35 +38,22 @@ // allow using aux LEDs as extra channel modes #include "chan-rgbaux.h" -#define USE_CHANNEL_MODES // channel modes: // * 0. FET+3+1 stacked -// * 1. aux red -// * 2. aux green -// * 3. aux blue -#define NUM_CHANNEL_MODES 4 -#define CM_MAIN 0 -#define CM_AUXRED 1 -#define CM_AUXGRN 2 -#define CM_AUXBLU 3 +// * 1+. aux RGB +#define NUM_CHANNEL_MODES (1 + NUM_RGB_AUX_CHANNEL_MODES) +enum CHANNEL_MODES { + CM_MAIN = 0, + RGB_AUX_ENUMS +}; #define DEFAULT_CHANNEL_MODE CM_MAIN -#define CHANNEL_MODES_ENABLED 0b00000001 -#define CHANNEL_HAS_ARGS 0b00000000 +// right-most bit first, modes are in fedcba9876543210 order +#define CHANNEL_MODES_ENABLED 0b0000000000000001 // no args //#define USE_CHANNEL_MODE_ARGS -//#define CHANNEL_MODE_ARGS 0,0,0,0 - -#define SET_LEVEL_MODES set_level_main, \ - set_level_auxred, \ - set_level_auxgrn, \ - set_level_auxblu -// gradual ticking for thermal regulation -#define GRADUAL_TICK_MODES gradual_tick_main, \ - gradual_tick_null, \ - gradual_tick_null, \ - gradual_tick_null +//#define CHANNEL_MODE_ARGS 0,0,0,0,0,0,0,0 #define PWM_CHANNELS 3 // old, remove this @@ -135,10 +122,6 @@ #undef USE_INDICATOR_LED_WHILE_RAMPING #endif -void set_level_main(uint8_t level); - -bool gradual_tick_main(uint8_t gt); - inline void hwdef_setup() { // enable output ports |