diff options
| author | Selene ToyKeeper | 2025-06-04 00:55:40 -0600 |
|---|---|---|
| committer | Selene ToyKeeper | 2025-06-04 00:55:40 -0600 |
| commit | c8a29a67f286d1d9d84ab000697b5727676b8784 (patch) | |
| tree | c6f1c9758e6ebaf920fd8b6b4c9edf66769e3c41 /hw/wurkkos/ts10 | |
| parent | ts25-boost: calibrated for new prototype (diff) | |
| parent | lockout mode now only does momentary moon/low on 1st and 2nd presses, (diff) | |
| download | anduril-c8a29a67f286d1d9d84ab000697b5727676b8784.tar.gz anduril-c8a29a67f286d1d9d84ab000697b5727676b8784.tar.bz2 anduril-c8a29a67f286d1d9d84ab000697b5727676b8784.zip | |
Merge branch 'trunk' into wurkkos-ts25-boost
* trunk:
lockout mode now only does momentary moon/low on 1st and 2nd presses, so it no longer flashes on each click while advancing to other functions
emisar-d3aa: reduced preflash by changing timing of power enable steps
fix "Error: Missing download info for actions/upload-artifact@v3"
fixed model number of hank-lume-x1 in MODELS
Added changelogs for 2025-04-29 release.
memester egg (was written a long time ago on a whim and never committed, may as well do it now)
changed hank-lume-x1 model number back on 2024-09-28 for some reason, and didn't commit... saving now to change branches, but should delete this commit if it turns out there was no reason for it
hank-lume-x1: minor calibration and cleaning - calibrated party strobe - removed duplicate or commented-out code - added a basic readme
hank-lume-x1 cleanup and calibration, part 1: - changed model number from 0281 to 0171 - cleaned up blink_negative and AUXLED_RGB_DIFFERENT_PORTS a little (but the latter needs a complete refactor, as soon as the hardware abstraction code can handle aux LEDs better) - cleaned up USE_LONG_BLINK_FOR_NEGATIVE_SIGN a little - removed USE_OTG_IN_MOMENTARY since it's not actually used - moved hw/loneoceans/lume-x1-avr32dd20/* files into hw/hank/lume-x1/ - superficial cleanup on hank/lume-x1/hwdef.* - removed some of the extra stuff from hank/lume-x1/anduril.h - adjusted calibration (especially ramp table) on hank-lume-x1 (ramp shape is pretty close to a D4K-boost now, but with more firefly modes) (calibration is based on a sample size of 1, further testing needed)
cherry-picked hank-lume-x1 code from https://github.com/loneoceans/anduril/commit/d83ebb75dab8c462b7efa841bccc00a136ff15a2
merged SammysHP's fix for TS10 lower-Vf LEDs, reverted my fix (they are now two separate build targets)
wurkkos-ts10-rgbaux: limit max power to 200/255, at Wurkkos's request (because otherwise the light destroys its own LEDs at full power)
Add Wurkkos TS10 RGB with reduced FET output
Diffstat (limited to 'hw/wurkkos/ts10')
| -rw-r--r-- | hw/wurkkos/ts10/rgbaux-lowfet/README.md | 12 | ||||
| -rw-r--r-- | hw/wurkkos/ts10/rgbaux-lowfet/anduril.h | 16 | ||||
| -rw-r--r-- | hw/wurkkos/ts10/rgbaux-lowfet/model | 1 | ||||
| -rw-r--r-- | hw/wurkkos/ts10/rgbaux/anduril.h | 3 |
4 files changed, 32 insertions, 0 deletions
diff --git a/hw/wurkkos/ts10/rgbaux-lowfet/README.md b/hw/wurkkos/ts10/rgbaux-lowfet/README.md new file mode 100644 index 0000000..2173723 --- /dev/null +++ b/hw/wurkkos/ts10/rgbaux-lowfet/README.md @@ -0,0 +1,12 @@ +# Wurkkos TS10 w/ RGB aux + reduced-power FET + +Starting in mid-2024, some TS10 models were built with LEDs with lower Vf, and +they destroy themselves when operated at full power from the direct-drive FET. +This branch runs at half power instead, to avoid hardware damage. + +Regardless, sustained turbo is not recommended on any TS10 models, because they +are overpowered for their size and LED type. + +- https://budgetlightforum.com/t/psa-anyone-with-a-new-ts10-do-not-flash-it-with-tks-ts10-rgbaux-firmware-or-turbo-will-fry-its-leds/225124 +- https://www.reddit.com/r/flashlight/comments/1emyyq9/psa_dont_flash_wurkkosts10rgbauxhex_to_your_new/ + diff --git a/hw/wurkkos/ts10/rgbaux-lowfet/anduril.h b/hw/wurkkos/ts10/rgbaux-lowfet/anduril.h new file mode 100644 index 0000000..5d012a5 --- /dev/null +++ b/hw/wurkkos/ts10/rgbaux-lowfet/anduril.h @@ -0,0 +1,16 @@ +// Wurkkos TS10 (RGB aux version with reduced FET output) config options for Anduril +// Copyright (C) 2024 Selene ToyKeeper +// SPDX-License-Identifier: GPL-3.0-or-later +#pragma once + +// most things are the same as TS10-rgbaux +#include "wurkkos/ts10/rgbaux/anduril.h" + +#undef PWM1_LEVELS +#undef PWM2_LEVELS +#undef PWM_TOPS + +#define PWM1_LEVELS 1, 1, 2, 2, 3, 3, 4, 5, 6, 6, 8, 9, 9, 10, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, 22, 23, 23, 24, 25, 26, 26, 27, 27, 28, 28, 29, 29, 30, 30, 31, 31, 32, 32, 33, 33, 34, 35, 36, 37, 38, 40, 41, 43, 45, 47, 50, 53, 56, 60, 63, 67, 71, 75, 79, 84, 89, 94, 99,104,110,116,122,129,136,143,150,158,166,174,183,192,202,211,222,232,243,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255 +// FET half power: +#define PWM2_LEVELS 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 14, 15, 17, 19, 20, 22, 24, 26, 27, 29, 31, 33, 35, 37, 39, 42, 44, 46, 48, 51, 53, 55, 58, 60, 63, 65, 68, 70, 73, 75, 78, 81, 84, 86, 89, 92, 95, 98,101,103,106,109,112,116,119,122,125,128 +#define PWM_TOPS 4095,2893,3917,2806,3252,2703,2684,2660,2640,2370,3000,2900,2630,2549,2246,2193,2030,1961,1889,1716,1642,1569,1497,1428,1290,1232,1176,1122,1070,976,932,890,849,779,745,685,656,605,579,536,514,476,457,424,407,379,364,340,327,314,302,291,280,276,266,262,257,253,253,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255 diff --git a/hw/wurkkos/ts10/rgbaux-lowfet/model b/hw/wurkkos/ts10/rgbaux-lowfet/model new file mode 100644 index 0000000..ef15105 --- /dev/null +++ b/hw/wurkkos/ts10/rgbaux-lowfet/model @@ -0,0 +1 @@ +0712 diff --git a/hw/wurkkos/ts10/rgbaux/anduril.h b/hw/wurkkos/ts10/rgbaux/anduril.h index a9d4f90..df0935a 100644 --- a/hw/wurkkos/ts10/rgbaux/anduril.h +++ b/hw/wurkkos/ts10/rgbaux/anduril.h @@ -31,7 +31,10 @@ // level_calc.py 5.7895 2 150 7135 0 0.1 125.25 FET 1 10 1200 --pwm dyn:61:4096:255:2.5 --clock 5:11:2.0 // (with heavy manual tweaks up to ~15/150) #define PWM1_LEVELS 1, 1, 2, 2, 3, 3, 4, 5, 6, 6, 8, 9, 9, 10, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, 22, 23, 23, 24, 25, 26, 26, 27, 27, 28, 28, 29, 29, 30, 30, 31, 31, 32, 32, 33, 33, 34, 35, 36, 37, 38, 40, 41, 43, 45, 47, 50, 53, 56, 60, 63, 67, 71, 75, 79, 84, 89, 94, 99,104,110,116,122,129,136,143,150,158,166,174,183,192,202,211,222,232,243,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 +// FET full power: #define PWM2_LEVELS 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 5, 7, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 29, 31, 34, 37, 39, 42, 45, 48, 51, 54, 58, 61, 65, 68, 72, 76, 80, 84, 88, 93, 97,102,107,112,117,122,127,133,139,145,151,157,163,170,177,183,191,198,205,213,221,229,238,246,255 +// FET limited to 200 / 255: +//#define PWM2_LEVELS 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 5, 6, 7, 9, 10, 12, 14, 15, 17, 18, 20, 22, 24, 26, 29, 30, 32, 35, 37, 40, 42, 45, 47, 50, 53, 56, 59, 62, 65, 69, 72, 76, 80, 83, 87, 91, 95, 99,104,109,113,118,123,127,133,138,143,149,155,160,167,173,179,186,192,200 #define PWM_TOPS 4095,2893,3917,2806,3252,2703,2684,2660,2640,2370,3000,2900,2630,2549,2246,2193,2030,1961,1889,1716,1642,1569,1497,1428,1290,1232,1176,1122,1070,976,932,890,849,779,745,685,656,605,579,536,514,476,457,424,407,379,364,340,327,314,302,291,280,276,266,262,257,253,253,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255 #define MAX_1x7135 90 #define MIN_THERM_STEPDOWN 60 |
