diff options
| -rw-r--r-- | hwdef-Noctigon_K9.3.h | 4 | ||||
| -rw-r--r-- | spaghetti-monster/anduril/MODELS | 1 | ||||
| -rw-r--r-- | spaghetti-monster/anduril/cfg-noctigon-k9.3.h | 33 |
3 files changed, 20 insertions, 18 deletions
diff --git a/hwdef-Noctigon_K9.3.h b/hwdef-Noctigon_K9.3.h index 15f93cb..d48623a 100644 --- a/hwdef-Noctigon_K9.3.h +++ b/hwdef-Noctigon_K9.3.h @@ -121,8 +121,8 @@ inline void hwdef_setup() { | (1 << AUXLED_G_PIN) | (1 << AUXLED_B_PIN) | (1 << BUTTON_LED_PIN) - | (1 << LED_ENABLE_PIN); - | (1 << LED2_ENABLE_PIN); + | (1 << LED_ENABLE_PIN) + | (1 << LED2_ENABLE_PIN) ; // configure PWM diff --git a/spaghetti-monster/anduril/MODELS b/spaghetti-monster/anduril/MODELS index 6697e52..96ec795 100644 --- a/spaghetti-monster/anduril/MODELS +++ b/spaghetti-monster/anduril/MODELS @@ -18,6 +18,7 @@ Model numbers: 0251 noctigon-k1 0252 noctigon-k1-sbt90 0253 noctigon-k1-12v +0261 noctigon-k9.3 0311 fw3a 0312 fw3a-219 0313 fw3a-nofet diff --git a/spaghetti-monster/anduril/cfg-noctigon-k9.3.h b/spaghetti-monster/anduril/cfg-noctigon-k9.3.h index 17c3c00..8276ec8 100644 --- a/spaghetti-monster/anduril/cfg-noctigon-k9.3.h +++ b/spaghetti-monster/anduril/cfg-noctigon-k9.3.h @@ -1,14 +1,13 @@ -// Noctigon KR4 config options for Anduril -// (and Emisar D4v2.5, which uses KR4 driver plus a button LED) -#define MODEL_NUMBER "0211" -#include "hwdef-Noctigon_KR4.h" +// Noctigon K9.3 config options for Anduril +#define MODEL_NUMBER "0261" +#include "hwdef-Noctigon_K9.3.h" // ATTINY: 1634 // this light has three aux LED channels: R, G, B #define USE_AUX_RGB_LEDS // the aux LEDs are front-facing, so turn them off while main LEDs are on //#define USE_AUX_RGB_LEDS_WHILE_ON -// it also has an independent LED in the button (D4v2.5 titanium/brass only) +// it also has an independent LED in the button #define USE_BUTTON_LED // TODO: the whole "indicator LED" thing needs to be refactored into // "aux LED(s)" and "button LED(s)" since they work a bit differently @@ -22,16 +21,18 @@ #define STANDBY_TICK_SPEED 3 // every 0.128 s -// brightness w/ SST-20 4000K LEDs: -// 0/1023: 0.35 lm -// 1/1023: 2.56 lm -// max regulated: 1740 lm -// FET: ~3700 lm -// maxreg at 130: level_calc.py cube 2 150 7135 0 2.5 1740 FET 1 10 2565 +// main LEDs +// max regulated: ~1750 lm +// FET: ~8000 lm +// 2nd LEDs +// max regulated: ~1500 lm // maxreg at 120: level_calc.py cube 2 150 7135 0 2.5 1740 FET 1 10 3190 #define RAMP_LENGTH 150 +// main LEDs #define PWM1_LEVELS 0,0,1,1,2,2,3,3,4,4,5,6,7,8,9,10,11,13,14,15,17,19,20,22,24,26,28,30,33,35,38,40,43,46,49,52,55,59,62,66,70,74,78,82,86,91,96,100,105,111,116,121,127,133,139,145,151,158,165,172,179,186,193,201,209,217,225,234,243,251,261,270,280,289,299,310,320,331,342,353,364,376,388,400,412,425,438,451,464,478,492,506,521,536,551,566,582,597,614,630,647,664,681,699,717,735,754,772,792,811,831,851,871,892,913,935,956,978,1001,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,0 #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,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,22,51,79,109,138,168,198,229,260,292,324,357,390,423,457,492,527,562,598,634,671,708,746,784,822,861,901,941,982,1023 +// 2nd LEDs +#define PWM3_LEVELS 0,0,1,1,2,2,3,3,4,4,5,5,6,7,8,9,10,11,12,13,15,16,17,18,20,21,23,24,26,27,29,31,33,35,37,39,41,43,45,48,50,53,55,58,61,63,66,69,72,75,79,82,85,89,92,96,100,104,108,112,116,120,125,129,134,138,143,148,153,158,163,169,174,180,185,191,197,203,209,215,222,228,235,242,248,255,263,270,277,285,292,300,308,316,324,333,341,350,359,368,377,386,395,405,414,424,434,444,454,465,475,486,497,508,519,531,542,554,566,578,590,603,615,628,641,654,667,680,694,708,722,736,750,765,779,794,809,825,840,856,872,888,904,920,937,954,971,988,1005,1023 #define DEFAULT_LEVEL 46 #define MAX_1x7135 120 #define HALFSPEED_LEVEL 10 @@ -44,16 +45,16 @@ #define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL #define RAMP_DISCRETE_STEPS 7 -// safe limit ~30% power / ~1400 lm (can sustain 900 lm) +// safe limit highest regulated power (no FET or turbo) #define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR -#define SIMPLE_UI_CEIL 110 +#define SIMPLE_UI_CEIL RAMP_DISCRETE_CEIL #define SIMPLE_UI_STEPS 5 // stop panicking at ~25% power or ~1000 lm #define THERM_FASTER_LEVEL 100 #define MIN_THERM_STEPDOWN DEFAULT_LEVEL -#define THERM_NEXT_WARNING_THRESHOLD 16 // accumulate less error before adjusting -#define THERM_RESPONSE_MAGNITUDE 128 // bigger adjustments +//#define THERM_NEXT_WARNING_THRESHOLD 16 // accumulate less error before adjusting +//#define THERM_RESPONSE_MAGNITUDE 128 // bigger adjustments // slow down party strobe; this driver can't pulse for 1ms or less // (only needed on no-FET build) @@ -61,5 +62,5 @@ #define THERM_CAL_OFFSET 5 -// can't reset the normal way because power is connected before the button +// for consistency with KR4 (not otherwise necessary though) #define USE_SOFT_FACTORY_RESET |