diff options
| author | Selene ToyKeeper | 2023-08-24 17:08:01 -0600 |
|---|---|---|
| committer | Selene ToyKeeper | 2023-08-24 17:08:01 -0600 |
| commit | 04a48e44b25d1c42dc26f837586a7503bb74b749 (patch) | |
| tree | fb4b0536ef8d9b05fa606d5ab082a30addf08781 /hwdef-emisar-2ch.c | |
| parent | fixed issue where tactical mode overrode strobe group memory (diff) | |
| download | anduril-04a48e44b25d1c42dc26f837586a7503bb74b749.tar.gz anduril-04a48e44b25d1c42dc26f837586a7503bb74b749.tar.bz2 anduril-04a48e44b25d1c42dc26f837586a7503bb74b749.zip | |
added channel mode per strobe mode, and made FSM channel mode more flexible,
and fixed issue in tactical mode where strobes wouldn't stop on button release
Diffstat (limited to 'hwdef-emisar-2ch.c')
| -rw-r--r-- | hwdef-emisar-2ch.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hwdef-emisar-2ch.c b/hwdef-emisar-2ch.c index 793e9bc..7955cf6 100644 --- a/hwdef-emisar-2ch.c +++ b/hwdef-emisar-2ch.c @@ -128,7 +128,7 @@ void set_level_blend(uint8_t level) { PWM_DATATYPE ch1_pwm, ch2_pwm; PWM_DATATYPE brightness = PWM_GET(pwm1_levels, level); PWM_DATATYPE top = PWM_GET(pwm_tops, level); - uint8_t blend = cfg.channel_mode_args[cfg.channel_mode]; + uint8_t blend = cfg.channel_mode_args[channel_mode]; calc_2ch_blend(&ch1_pwm, &ch2_pwm, brightness, top, blend); @@ -144,7 +144,7 @@ void set_level_auto(uint8_t level) { PWM_DATATYPE brightness = PWM_GET(pwm1_levels, level); PWM_DATATYPE top = PWM_GET(pwm_tops, level); uint8_t blend = 255 * (uint16_t)level / RAMP_SIZE; - if (cfg.channel_mode_args[cfg.channel_mode] & 0b01000000) + if (cfg.channel_mode_args[channel_mode] & 0b01000000) blend = 255 - blend; calc_2ch_blend(&ch1_pwm, &ch2_pwm, brightness, top, blend); @@ -185,7 +185,7 @@ bool gradual_tick_blend(uint8_t gt) { PWM_DATATYPE ch1_pwm, ch2_pwm; PWM_DATATYPE brightness = PWM_GET(pwm1_levels, gt); PWM_DATATYPE top = PWM_GET(pwm_tops, gt); - uint8_t blend = cfg.channel_mode_args[cfg.channel_mode]; + uint8_t blend = cfg.channel_mode_args[channel_mode]; calc_2ch_blend(&ch1_pwm, &ch2_pwm, brightness, top, blend); @@ -197,7 +197,7 @@ bool gradual_tick_auto(uint8_t gt) { PWM_DATATYPE brightness = PWM_GET(pwm1_levels, gt); PWM_DATATYPE top = PWM_GET(pwm_tops, gt); uint8_t blend = 255 * (uint16_t)gt / RAMP_SIZE; - if (cfg.channel_mode_args[cfg.channel_mode] & 0b01000000) + if (cfg.channel_mode_args[channel_mode] & 0b01000000) blend = 255 - blend; calc_2ch_blend(&ch1_pwm, &ch2_pwm, brightness, top, blend); |