From 8e9106f6fb26eadbfffd56fa14390b9f41e74ed2 Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Tue, 2 May 2023 09:13:39 -0600 Subject: converted Wurkkos TS25 build... ... and gave it a smoother ramp ... and the other new functions added recently --- hwdef-wurkkos-ts25.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 hwdef-wurkkos-ts25.c (limited to 'hwdef-wurkkos-ts25.c') diff --git a/hwdef-wurkkos-ts25.c b/hwdef-wurkkos-ts25.c new file mode 100644 index 0000000..1d5b656 --- /dev/null +++ b/hwdef-wurkkos-ts25.c @@ -0,0 +1,49 @@ +// Wurkkos TS25 PWM helper functions +// Copyright (C) 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_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 + uint16_t top = PWM_GET16(pwm_tops, level); + + CH1_PWM = ch1_pwm; + CH2_PWM = ch2_pwm; + // wait to sync the counter and avoid flashes + // (unnecessary w/ buffered registers) + //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_main(uint8_t gt) { + PWM_DATATYPE pwm1 = PWM_GET(pwm1_levels, gt); + PWM_DATATYPE pwm2 = PWM_GET(pwm2_levels, gt); + + GRADUAL_ADJUST_STACKED(pwm1, CH1_PWM, PWM_TOP_INIT); + GRADUAL_ADJUST_SIMPLE (pwm2, CH2_PWM); + + if ( (pwm1 == CH1_PWM) + && (pwm2 == CH2_PWM) + ) { + return true; // done + } + return false; // not done yet +} + -- cgit v1.2.3 From a72dbab22d7dd159c35c42961af9f51ff38959d7 Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Mon, 17 Jul 2023 13:00:21 -0600 Subject: fixed Wurkkos builds (using new refactor) --- hwdef-wurkkos-ts25.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'hwdef-wurkkos-ts25.c') diff --git a/hwdef-wurkkos-ts25.c b/hwdef-wurkkos-ts25.c index 1d5b656..7ae7b28 100644 --- a/hwdef-wurkkos-ts25.c +++ b/hwdef-wurkkos-ts25.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 4ac24a31fc3a9091c712e2c81f9871512d86893d Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Sat, 26 Aug 2023 19:09:00 -0600 Subject: updated wurkkos-ts25 to use set_level_zero() (mostly as a quick test, will do the rest of the builds later) --- hwdef-wurkkos-ts25.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'hwdef-wurkkos-ts25.c') diff --git a/hwdef-wurkkos-ts25.c b/hwdef-wurkkos-ts25.c index 7ae7b28..3c98716 100644 --- a/hwdef-wurkkos-ts25.c +++ b/hwdef-wurkkos-ts25.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,15 @@ Channel channels[] = { }; +void set_level_zero() { + CH1_PWM = 0; + CH2_PWM = 0; + PWM_CNT = 0; // reset phase + return; +} + // 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 From cfdbff9ff8ee8f5a36303c8710957fb88ef8b1c7 Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Thu, 12 Oct 2023 17:54:35 -0600 Subject: misc comments, spacing, documentation --- hwdef-wurkkos-ts25.c | 1 - 1 file changed, 1 deletion(-) (limited to 'hwdef-wurkkos-ts25.c') diff --git a/hwdef-wurkkos-ts25.c b/hwdef-wurkkos-ts25.c index 3c98716..26c9b0d 100644 --- a/hwdef-wurkkos-ts25.c +++ b/hwdef-wurkkos-ts25.c @@ -25,7 +25,6 @@ void set_level_zero() { CH1_PWM = 0; CH2_PWM = 0; PWM_CNT = 0; // reset phase - return; } // single set of LEDs with 2 stacked power channels, DDFET+1 or DDFET+linear -- cgit v1.2.3