From becb1525aadc1039a99ecdc6f7ae5cf3a1beb2fb Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Fri, 28 Apr 2023 03:06:22 -0600 Subject: D4v2 FET+1 model: works again, and now uses dynamic PWM (lower lows) (also added generic channel modes for RGB aux LEDs) --- hwdef-emisar-d4v2.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 hwdef-emisar-d4v2.c (limited to 'hwdef-emisar-d4v2.c') diff --git a/hwdef-emisar-d4v2.c b/hwdef-emisar-d4v2.c new file mode 100644 index 0000000..dce6c92 --- /dev/null +++ b/hwdef-emisar-d4v2.c @@ -0,0 +1,45 @@ +// Emisar D4v2 PWM helper functions +// Copyright (C) 2017-2023 Selene ToyKeeper +// SPDX-License-Identifier: GPL-3.0-or-later + +#pragma once + +#include "chan-rgbaux.c" + +// single set of LEDs with 2 stacked power channels, DDFET+1 or DDFET+linear +void set_level_stacked(uint8_t level) { + if (level == 0) { + LOW_PWM_LVL = 0; + HIGH_PWM_LVL = 0; + PWM_CNT = 0; // reset phase + } else { + level --; // PWM array index = level - 1 + LOW_PWM_LVL = PWM_GET(pwm1_levels, level); + HIGH_PWM_LVL = PWM_GET(pwm2_levels, level); + // pulse frequency modulation, a.k.a. dynamic PWM + uint16_t top = PWM_GET(pwm_tops, level); + // wait to sync the counter and avoid flashes + while(actual_level && (PWM_CNT > (top - 32))) {} + PWM_TOP = top; + // force reset phase when turning on from zero + // (because otherwise the initial response is inconsistent) + if (! actual_level) PWM_CNT = 0; + } +} + +bool gradual_tick_stacked(uint8_t gt) { + GRADUAL_TICK_SETUP(); + + GRADUAL_ADJUST(pwm1_levels, LOW_PWM_LVL, PWM_TOP_INIT); + GRADUAL_ADJUST_1CH(pwm2_levels, HIGH_PWM_LVL); + + // did we go far enough to hit the next defined ramp level? + // if so, update the main ramp level tracking var + if ( (LOW_PWM_LVL == PWM_GET(pwm1_levels, gt)) + && (HIGH_PWM_LVL == PWM_GET(pwm2_levels, gt)) + ) { + return true; + } + return false; +} + -- cgit v1.2.3 From 71929d68d210a26ac12bd53299cc0a52fcfafdbf Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Sat, 29 Apr 2023 01:21:51 -0600 Subject: missed this file on previous commit --- hwdef-emisar-d4v2.c | 55 ++++++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 26 deletions(-) (limited to 'hwdef-emisar-d4v2.c') diff --git a/hwdef-emisar-d4v2.c b/hwdef-emisar-d4v2.c index dce6c92..9b647a3 100644 --- a/hwdef-emisar-d4v2.c +++ b/hwdef-emisar-d4v2.c @@ -7,39 +7,42 @@ #include "chan-rgbaux.c" // single set of LEDs with 2 stacked power channels, DDFET+1 or DDFET+linear -void set_level_stacked(uint8_t level) { +void set_level_main(uint8_t level) { if (level == 0) { - LOW_PWM_LVL = 0; - HIGH_PWM_LVL = 0; - PWM_CNT = 0; // reset phase - } else { - level --; // PWM array index = level - 1 - LOW_PWM_LVL = PWM_GET(pwm1_levels, level); - HIGH_PWM_LVL = PWM_GET(pwm2_levels, level); - // pulse frequency modulation, a.k.a. dynamic PWM - uint16_t top = PWM_GET(pwm_tops, level); - // wait to sync the counter and avoid flashes - while(actual_level && (PWM_CNT > (top - 32))) {} - PWM_TOP = top; - // force reset phase when turning on from zero - // (because otherwise the initial response is inconsistent) - if (! actual_level) PWM_CNT = 0; + CH1_PWM = 0; + CH2_PWM = 0; + PWM_CNT = 0; // reset phase + return; } + + level --; // PWM array index = level - 1 + PWM_DATATYPE ch1_pwm = PWM_GET(pwm1_levels, level); + PWM_DATATYPE ch2_pwm = PWM_GET(pwm2_levels, level); + // pulse frequency modulation, a.k.a. dynamic PWM + uint16_t top = PWM_GET(pwm_tops, level); + + CH1_PWM = ch1_pwm; + CH2_PWM = ch2_pwm; + // wait to sync the counter and avoid flashes + while(actual_level && (PWM_CNT > (top - 32))) {} + PWM_TOP = top; + // force reset phase when turning on from zero + // (because otherwise the initial response is inconsistent) + if (! actual_level) PWM_CNT = 0; } -bool gradual_tick_stacked(uint8_t gt) { - GRADUAL_TICK_SETUP(); +bool gradual_tick_main(uint8_t gt) { + PWM_DATATYPE pwm1 = PWM_GET(pwm1_levels, gt); + PWM_DATATYPE pwm2 = PWM_GET(pwm2_levels, gt); - GRADUAL_ADJUST(pwm1_levels, LOW_PWM_LVL, PWM_TOP_INIT); - GRADUAL_ADJUST_1CH(pwm2_levels, HIGH_PWM_LVL); + GRADUAL_ADJUST_STACKED(pwm1, CH1_PWM, PWM_TOP_INIT); + GRADUAL_ADJUST_SIMPLE (pwm2, CH2_PWM); - // did we go far enough to hit the next defined ramp level? - // if so, update the main ramp level tracking var - if ( (LOW_PWM_LVL == PWM_GET(pwm1_levels, gt)) - && (HIGH_PWM_LVL == PWM_GET(pwm2_levels, gt)) + if ( (pwm1 == CH1_PWM) + && (pwm2 == CH2_PWM) ) { - return true; + return true; // done } - return false; + return false; // not done yet } -- cgit v1.2.3 From 278d58e747f5692ef614eb6605774688f85656e3 Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Sat, 29 Apr 2023 01:54:19 -0600 Subject: D4v2 can use 8-bit ramp tables too --- hwdef-emisar-d4v2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hwdef-emisar-d4v2.c') diff --git a/hwdef-emisar-d4v2.c b/hwdef-emisar-d4v2.c index 9b647a3..db32f19 100644 --- a/hwdef-emisar-d4v2.c +++ b/hwdef-emisar-d4v2.c @@ -19,7 +19,7 @@ void set_level_main(uint8_t level) { PWM_DATATYPE ch1_pwm = PWM_GET(pwm1_levels, level); PWM_DATATYPE ch2_pwm = PWM_GET(pwm2_levels, level); // pulse frequency modulation, a.k.a. dynamic PWM - uint16_t top = PWM_GET(pwm_tops, level); + uint16_t top = PWM_GET16(pwm_tops, level); CH1_PWM = ch1_pwm; CH2_PWM = ch2_pwm; -- cgit v1.2.3 From 723b5b1ffa8f12b29110a2133a8f09beaf528aad Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Sun, 16 Jul 2023 16:27:44 -0600 Subject: fixed d4v2, kr4, m44, emisar-2ch (using new refactor), added RGB aux channel modes to models which didn't have it --- hwdef-emisar-d4v2.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'hwdef-emisar-d4v2.c') diff --git a/hwdef-emisar-d4v2.c b/hwdef-emisar-d4v2.c index db32f19..c4ae5dd 100644 --- a/hwdef-emisar-d4v2.c +++ b/hwdef-emisar-d4v2.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[] = { + { // channel 1 only + .set_level = set_level_main, + .gradual_tick = gradual_tick_main + }, + RGB_AUX_CHANNELS +}; + + // single set of LEDs with 2 stacked power channels, DDFET+1 or DDFET+linear void set_level_main(uint8_t level) { if (level == 0) { -- cgit v1.2.3 From 6c7c99b1be9a684e3a6ccc533f46979b39f7a529 Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Tue, 18 Jul 2023 14:44:40 -0600 Subject: converted Emisar D4 and BLF Q8 to multi-channel, and enabled previously-removed tactical mode on the Q8 since there seems to be enough space now (also lowercased their hwdef files) --- hwdef-emisar-d4v2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hwdef-emisar-d4v2.c') diff --git a/hwdef-emisar-d4v2.c b/hwdef-emisar-d4v2.c index c4ae5dd..ada4eb8 100644 --- a/hwdef-emisar-d4v2.c +++ b/hwdef-emisar-d4v2.c @@ -11,7 +11,7 @@ bool gradual_tick_main(uint8_t gt); Channel channels[] = { - { // channel 1 only + { // main LEDs .set_level = set_level_main, .gradual_tick = gradual_tick_main }, -- cgit v1.2.3 From d34d0e7acb1f1e49d21af7cf1c9e08161ce95dd4 Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Sun, 17 Sep 2023 04:37:25 -0600 Subject: fixed builds which weren't using set_level_zero() yet... - emisar-d4 - emisar-d4v2 - emisar-d4v2-nofet - emisar-d4sv2 - emisar-2ch - emisar-2ch-fet - noctigon-dm11-boost - noctigon-k1 - noctigon-kr4 - noctigon-kr4-nofet - sofirn-lt1s-pro ... and removed old build targets for d4sv2-tintramp, because it was replaced by emisar-2ch a while ago. --- hwdef-emisar-d4v2.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'hwdef-emisar-d4v2.c') diff --git a/hwdef-emisar-d4v2.c b/hwdef-emisar-d4v2.c index ada4eb8..026b30d 100644 --- a/hwdef-emisar-d4v2.c +++ b/hwdef-emisar-d4v2.c @@ -6,6 +6,8 @@ #include "chan-rgbaux.c" +void set_level_zero(); + void set_level_main(uint8_t level); bool gradual_tick_main(uint8_t gt); @@ -19,16 +21,14 @@ Channel channels[] = { }; +void set_level_zero() { + CH1_PWM = 0; + CH2_PWM = 0; + PWM_CNT = 0; // reset phase +} + // single set of LEDs with 2 stacked power channels, DDFET+1 or DDFET+linear void set_level_main(uint8_t level) { - if (level == 0) { - CH1_PWM = 0; - CH2_PWM = 0; - PWM_CNT = 0; // reset phase - return; - } - - level --; // PWM array index = level - 1 PWM_DATATYPE ch1_pwm = PWM_GET(pwm1_levels, level); PWM_DATATYPE ch2_pwm = PWM_GET(pwm2_levels, level); // pulse frequency modulation, a.k.a. dynamic PWM -- cgit v1.2.3