merged fsm branch (mostly because D4v2.5 build targets were merged into KR4,

  and merging now will be easier than resolving conflicts later)

6 files changed, 24 insertions, 16 deletions

diff --git a/README b/README
index 1e6e842..59e1c8e 100644
--- a/README
+++ b/README
@@ -42,7 +42,11 @@ Some useful hardware for flashing firmware:
       https://www.aliexpress.com/store/product/Free-shipping-Programmer-Testing-Clip-SOP8-SOP-SOIC-8-SOIC8-DIP8-DIP-8-Pin-IC-Test/1171090_32402561848.html
       https://www.aliexpress.com/store/product/20pcs-20cm-2-54mm-1p-1p-Pin-Female-to-Female-Color-Breadboard-Cable-Jump-Wire-Jumper/1171090_32628811461.html
 
-For Windows users, these links may be useful:
+For Windows / MacOS users, these links may be useful:
+
+  Oweban's guides:  (Windows 10, MacOS X) (not generic, focuses on Anduril)
+
+    http://budgetlightforum.com/node/73487
 
   Hoop's guide:
 
diff --git a/spaghetti-monster/anduril/cfg-emisar-d4v2.5-219.h b/spaghetti-monster/anduril/cfg-emisar-d4v2.5-219.h
deleted file mode 100644
index c0a5b17..0000000
--- a/spaghetti-monster/anduril/cfg-emisar-d4v2.5-219.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Emisar D4v2.5 (75% FET) config options for Anduril
-// (adapted from cfg-noctigon-kr4-219.h)
-#include "cfg-emisar-d4v2.5.h"
-// ATTINY: 1634
-
-// don't turn off first channel at turbo level
-#undef PWM1_LEVELS
-#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,1023
-// 75% FET power
-#undef PWM2_LEVELS
-#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,17,39,60,82,104,126,149,172,195,219,243,268,293,318,343,369,396,422,449,476,504,531,560,588,617,646,676,706,737,768
-
diff --git a/spaghetti-monster/anduril/cfg-emisar-d4v2.5-nofet.h b/spaghetti-monster/anduril/cfg-emisar-d4v2.5-nofet.h.THIS
index 92c4252..92c4252 100644
--- a/spaghetti-monster/anduril/cfg-emisar-d4v2.5-nofet.h
+++ b/spaghetti-monster/anduril/cfg-emisar-d4v2.5-nofet.h.THIS
diff --git a/spaghetti-monster/anduril/cfg-emisar-d4v2.5.h b/spaghetti-monster/anduril/cfg-emisar-d4v2.5.h.THIS
index 83f2c3a..83f2c3a 100644
--- a/spaghetti-monster/anduril/cfg-emisar-d4v2.5.h
+++ b/spaghetti-monster/anduril/cfg-emisar-d4v2.5.h.THIS
diff --git a/spaghetti-monster/anduril/cfg-noctigon-kr4-nofet.h b/spaghetti-monster/anduril/cfg-noctigon-kr4-nofet.h
index 8767fef..9f7616b 100644
--- a/spaghetti-monster/anduril/cfg-noctigon-kr4-nofet.h
+++ b/spaghetti-monster/anduril/cfg-noctigon-kr4-nofet.h
@@ -1,4 +1,6 @@
 // Noctigon KR4 (fetless) config options for Anduril
+// (and Noctigon KR1)
+// (and Emisar D4v2 E21A, a.k.a. "D4v2.5")
 #include "cfg-noctigon-kr4.h"
 // ATTINY: 1634
 
@@ -39,6 +41,10 @@
 // make candle mode wobble more
 #define CANDLE_AMPLITUDE 32
 
+// slow down party strobe; this driver can't pulse for 1ms or less
+// (only needed on no-FET build)
+#define PARTY_STROBE_ONTIME 2
+
 // stop panicking at ~90% power or ~1600 lm
 #undef THERM_FASTER_LEVEL
 #define THERM_FASTER_LEVEL 143
diff --git a/spaghetti-monster/anduril/cfg-noctigon-kr4.h b/spaghetti-monster/anduril/cfg-noctigon-kr4.h
index 874d9b8..3a56fa8 100644
--- a/spaghetti-monster/anduril/cfg-noctigon-kr4.h
+++ b/spaghetti-monster/anduril/cfg-noctigon-kr4.h
@@ -1,11 +1,20 @@
 // Noctigon KR4 config options for Anduril
+// (and Emisar D4v2.5, which uses KR4 driver plus a button LED)
 #include "hwdef-Noctigon_KR4.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
-//#define USE_INDICATOR_LED_WHILE_RAMPING
+// it also has an independent LED in the button (D4v2.5 titanium/brass only)
+#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
+// enabling this option breaks the button LED on D4v2.5
+#ifdef USE_INDICATOR_LED_WHILE_RAMPING
+#undef USE_INDICATOR_LED_WHILE_RAMPING
+#endif
 #define RGB_LED_OFF_DEFAULT 0x17  // low, rainbow
 #define RGB_LED_LOCKOUT_DEFAULT 0x37  // blinking, rainbow
 #define RGB_RAINBOW_SPEED 0x03  // half a second per color
@@ -46,11 +55,12 @@
 #define THERM_NEXT_WARNING_THRESHOLD 16  // accumulate less error before adjusting
 #define THERM_RESPONSE_MAGNITUDE 128  // bigger adjustments
 
-// easier access to thermal config mode, for Noctigon
+// easier access to thermal config mode
 #define USE_TENCLICK_THERMAL_CONFIG
 
 // slow down party strobe; this driver can't pulse for 1ms or less
-#define PARTY_STROBE_ONTIME 2
+// (only needed on no-FET build)
+//#define PARTY_STROBE_ONTIME 2
 
 #define THERM_CAL_OFFSET 5