aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSelene ToyKeeper2021-04-13 23:33:20 -0600
committerSelene ToyKeeper2021-04-13 23:33:20 -0600
commita04399b7b432f59db3ff397ace09613f582fd7b6 (patch)
treec347d71d3baeb1b95b348e4c6ce22c818a657526
parentfixed missing ifdef for simple UI (diff)
downloadanduril-a04399b7b432f59db3ff397ace09613f582fd7b6.tar.gz
anduril-a04399b7b432f59db3ff397ace09613f582fd7b6.tar.bz2
anduril-a04399b7b432f59db3ff397ace09613f582fd7b6.zip
config updates for Hank (Emisar / Noctigon):
- use cycling rainbow mode by default on lights with RGB LEDs (instead of voltage, because it's better for impressing new users) - use 2C turbo instead of 2C ceiling (Anduril 1 style instead of Anduril 2 style) also some other minor housekeeping... - make all K1 models use consistent rainbow cycling speed - enable auto-lock and manual memory timer on Emisar D1v2 - remove redundant RGB config on Lume1 (it had incorrect comments anyway)
Diffstat (limited to '')
-rw-r--r--spaghetti-monster/anduril/cfg-emisar-d18.h1
-rw-r--r--spaghetti-monster/anduril/cfg-emisar-d1v2.h2
-rw-r--r--spaghetti-monster/anduril/cfg-emisar-d4.h1
-rw-r--r--spaghetti-monster/anduril/cfg-emisar-d4s.h1
-rw-r--r--spaghetti-monster/anduril/cfg-emisar-d4sv2.h1
-rw-r--r--spaghetti-monster/anduril/cfg-emisar-d4v2.h1
-rw-r--r--spaghetti-monster/anduril/cfg-fw3x-lume1.h2
-rw-r--r--spaghetti-monster/anduril/cfg-noctigon-k1-12v.h1
-rw-r--r--spaghetti-monster/anduril/cfg-noctigon-k1-sbt90.h4
-rw-r--r--spaghetti-monster/anduril/cfg-noctigon-k1.h1
-rw-r--r--spaghetti-monster/anduril/cfg-noctigon-k9.3.h2
-rw-r--r--spaghetti-monster/anduril/cfg-noctigon-kr4.h1
12 files changed, 11 insertions, 7 deletions
diff --git a/spaghetti-monster/anduril/cfg-emisar-d18.h b/spaghetti-monster/anduril/cfg-emisar-d18.h
index 6aaa693..2147dc5 100644
--- a/spaghetti-monster/anduril/cfg-emisar-d18.h
+++ b/spaghetti-monster/anduril/cfg-emisar-d18.h
@@ -1,6 +1,7 @@
// Emisar D18 (FET+13+1) config options for Anduril
#define MODEL_NUMBER "0141"
#include "hwdef-Emisar_D18.h"
+#include "hank-cfg.h"
// level_calc.py seventh 3 150 7135 1 1.4 117.99 7135 6 1 1706.86 FET 3 10 13000
// (designed to make 1x hit at level 50, and Nx hit at level 100)
diff --git a/spaghetti-monster/anduril/cfg-emisar-d1v2.h b/spaghetti-monster/anduril/cfg-emisar-d1v2.h
index c2815fd..48a3ef0 100644
--- a/spaghetti-monster/anduril/cfg-emisar-d1v2.h
+++ b/spaghetti-monster/anduril/cfg-emisar-d1v2.h
@@ -9,8 +9,6 @@
#undef USE_AUX_RGB_LEDS
// ... and no button LED
#undef USE_BUTTON_LED
-// no aux LEDs means no need for sleep ticks
-#undef TICK_DURING_STANDBY
// safe limit ~50% power
#undef SIMPLE_UI_CEIL
diff --git a/spaghetti-monster/anduril/cfg-emisar-d4.h b/spaghetti-monster/anduril/cfg-emisar-d4.h
index caabb0e..b21c6a3 100644
--- a/spaghetti-monster/anduril/cfg-emisar-d4.h
+++ b/spaghetti-monster/anduril/cfg-emisar-d4.h
@@ -1,6 +1,7 @@
// Emisar D4 config options for Anduril
#define MODEL_NUMBER "0111"
#include "hwdef-Emisar_D4.h"
+#include "hank-cfg.h"
// ../../bin/level_calc.py 1 65 7135 1 0.8 150
// ... mixed with this:
diff --git a/spaghetti-monster/anduril/cfg-emisar-d4s.h b/spaghetti-monster/anduril/cfg-emisar-d4s.h
index fdab906..ef7534b 100644
--- a/spaghetti-monster/anduril/cfg-emisar-d4s.h
+++ b/spaghetti-monster/anduril/cfg-emisar-d4s.h
@@ -1,6 +1,7 @@
// Emisar D4S config options for Anduril
#define MODEL_NUMBER "0131"
#include "hwdef-Emisar_D4S.h"
+#include "hank-cfg.h"
// the button lights up
#define USE_INDICATOR_LED
diff --git a/spaghetti-monster/anduril/cfg-emisar-d4sv2.h b/spaghetti-monster/anduril/cfg-emisar-d4sv2.h
index ad6de03..df49532 100644
--- a/spaghetti-monster/anduril/cfg-emisar-d4sv2.h
+++ b/spaghetti-monster/anduril/cfg-emisar-d4sv2.h
@@ -1,6 +1,7 @@
// Emisar D4S V2 config options for Anduril
#define MODEL_NUMBER "0133"
#include "hwdef-Emisar_D4Sv2.h"
+#include "hank-cfg.h"
// ATTINY: 1634
// this light has three aux LED channels: R, G, B
diff --git a/spaghetti-monster/anduril/cfg-emisar-d4v2.h b/spaghetti-monster/anduril/cfg-emisar-d4v2.h
index 6e389aa..9759c0e 100644
--- a/spaghetti-monster/anduril/cfg-emisar-d4v2.h
+++ b/spaghetti-monster/anduril/cfg-emisar-d4v2.h
@@ -1,6 +1,7 @@
// Emisar D4 config options for Anduril
#define MODEL_NUMBER "0113"
#include "hwdef-Emisar_D4v2.h"
+#include "hank-cfg.h"
// ATTINY: 1634
// this light has three aux LED channels: R, G, B
diff --git a/spaghetti-monster/anduril/cfg-fw3x-lume1.h b/spaghetti-monster/anduril/cfg-fw3x-lume1.h
index 75853ec..818fb9d 100644
--- a/spaghetti-monster/anduril/cfg-fw3x-lume1.h
+++ b/spaghetti-monster/anduril/cfg-fw3x-lume1.h
@@ -27,8 +27,6 @@
#ifdef USE_INDICATOR_LED_WHILE_RAMPING
#undef USE_INDICATOR_LED_WHILE_RAMPING
#endif
-#define RGB_LED_OFF_DEFAULT 0x18 // low, voltage
-#define RGB_LED_LOCKOUT_DEFAULT 0x37 // blinking, rainbow
// enable blinking aux LEDs
#define TICK_DURING_STANDBY
diff --git a/spaghetti-monster/anduril/cfg-noctigon-k1-12v.h b/spaghetti-monster/anduril/cfg-noctigon-k1-12v.h
index b1a12eb..25add17 100644
--- a/spaghetti-monster/anduril/cfg-noctigon-k1-12v.h
+++ b/spaghetti-monster/anduril/cfg-noctigon-k1-12v.h
@@ -1,6 +1,7 @@
// Noctigon K1 12V config options for Anduril
#define MODEL_NUMBER "0253"
#include "hwdef-Noctigon_K1-12V.h"
+#include "hank-cfg.h"
// ATTINY: 1634
// Most K1 lights can run hotter than default, but the 12V model
diff --git a/spaghetti-monster/anduril/cfg-noctigon-k1-sbt90.h b/spaghetti-monster/anduril/cfg-noctigon-k1-sbt90.h
index 99813d1..ca6a9d1 100644
--- a/spaghetti-monster/anduril/cfg-noctigon-k1-sbt90.h
+++ b/spaghetti-monster/anduril/cfg-noctigon-k1-sbt90.h
@@ -2,6 +2,7 @@
// (is a K1 host with a KR4-like driver and a really high-powered LED)
#define MODEL_NUMBER "0252"
#include "hwdef-Noctigon_K1-SBT90.h"
+#include "hank-cfg.h"
// ATTINY: 1634
// this light can safely run a bit hotter than most
@@ -12,7 +13,6 @@
#define USE_AUX_RGB_LEDS
#define USE_AUX_RGB_LEDS_WHILE_ON
#define USE_INDICATOR_LED_WHILE_RAMPING
-#define RGB_RAINBOW_SPEED 0x03 // half a second per color in rainbow mode
// enable blinking aux LEDs
#define TICK_DURING_STANDBY
@@ -52,7 +52,7 @@
//#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
+// normal party strobe speed; this driver can pulse very quickly
//#define PARTY_STROBE_ONTIME 2
#define THERM_CAL_OFFSET 5
diff --git a/spaghetti-monster/anduril/cfg-noctigon-k1.h b/spaghetti-monster/anduril/cfg-noctigon-k1.h
index 6531ecd..0baafc0 100644
--- a/spaghetti-monster/anduril/cfg-noctigon-k1.h
+++ b/spaghetti-monster/anduril/cfg-noctigon-k1.h
@@ -2,6 +2,7 @@
#define MODEL_NUMBER "0251"
// (originally known as Emisar D1S v2)
#include "hwdef-Noctigon_K1.h"
+#include "hank-cfg.h"
// ATTINY: 1634
// this light can safely run a bit hotter than most
diff --git a/spaghetti-monster/anduril/cfg-noctigon-k9.3.h b/spaghetti-monster/anduril/cfg-noctigon-k9.3.h
index e61ea13..4ae859a 100644
--- a/spaghetti-monster/anduril/cfg-noctigon-k9.3.h
+++ b/spaghetti-monster/anduril/cfg-noctigon-k9.3.h
@@ -1,6 +1,7 @@
// Noctigon K9.3 config options for Anduril
#define MODEL_NUMBER "0261"
#include "hwdef-Noctigon_K9.3.h"
+#include "hank-cfg.h"
// ATTINY: 1634
// this model requires some special code
#define OVERRIDES_FILE cfg-noctigon-k9.3.c
@@ -11,7 +12,6 @@ inline void set_level_override(uint8_t level);
// this light has three aux LED channels: R, G, B
#define USE_AUX_RGB_LEDS
-#define RGB_LED_OFF_DEFAULT 0x18 // low, rainbow
// 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
diff --git a/spaghetti-monster/anduril/cfg-noctigon-kr4.h b/spaghetti-monster/anduril/cfg-noctigon-kr4.h
index 17c3c00..eea6a07 100644
--- a/spaghetti-monster/anduril/cfg-noctigon-kr4.h
+++ b/spaghetti-monster/anduril/cfg-noctigon-kr4.h
@@ -2,6 +2,7 @@
// (and Emisar D4v2.5, which uses KR4 driver plus a button LED)
#define MODEL_NUMBER "0211"
#include "hwdef-Noctigon_KR4.h"
+#include "hank-cfg.h"
// ATTINY: 1634
// this light has three aux LED channels: R, G, B