From 8fa7bb422921b625520b22595ce1edfda4beaa22 Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Tue, 2 May 2023 04:47:38 -0600 Subject: converted Wurkkos TS10 build (and made its ramp smoother w/ better low modes) --- hwdef-wurkkos-ts10.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 hwdef-wurkkos-ts10.c (limited to 'hwdef-wurkkos-ts10.c') diff --git a/hwdef-wurkkos-ts10.c b/hwdef-wurkkos-ts10.c new file mode 100644 index 0000000..14f6794 --- /dev/null +++ b/hwdef-wurkkos-ts10.c @@ -0,0 +1,49 @@ +// Wurkkos TS10 PWM helper functions +// Copyright (C) 2023 Selene ToyKeeper +// SPDX-License-Identifier: GPL-3.0-or-later + +#pragma once + +#include "chan-aux.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-ts10.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'hwdef-wurkkos-ts10.c') diff --git a/hwdef-wurkkos-ts10.c b/hwdef-wurkkos-ts10.c index 14f6794..44602c0 100644 --- a/hwdef-wurkkos-ts10.c +++ b/hwdef-wurkkos-ts10.c @@ -6,6 +6,22 @@ #include "chan-aux.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 + }, + { // aux LEDs + .set_level = set_level_aux, + .gradual_tick = gradual_tick_null + } +}; + + // 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 158ad8bc28a578874e0906c0f2416ef8e5fa8446 Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Tue, 29 Aug 2023 12:55:27 -0600 Subject: renamed wurkkos-ts10-rgb to wurkkos-ts10-rgbaux (for consistency, and in case they ever make a full RGB version) (also, raised the post-off voltage brightness threshold, because these aux LEDs are pretty bright) (and updated the TS10 hwdef to the current API) --- hwdef-wurkkos-ts10.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'hwdef-wurkkos-ts10.c') diff --git a/hwdef-wurkkos-ts10.c b/hwdef-wurkkos-ts10.c index 44602c0..06f5bac 100644 --- a/hwdef-wurkkos-ts10.c +++ b/hwdef-wurkkos-ts10.c @@ -6,6 +6,8 @@ #include "chan-aux.c" +void set_level_zero(); + void set_level_main(uint8_t level); bool gradual_tick_main(uint8_t gt); @@ -22,16 +24,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