diff options
| author | Selene ToyKeeper | 2021-09-24 05:28:15 -0600 |
|---|---|---|
| committer | Selene ToyKeeper | 2021-09-24 05:28:15 -0600 |
| commit | acf62345e94439df0212c388d5e7143a50005825 (patch) | |
| tree | c38dddbdd2e852bb237ae657ff6a358689ce677b | |
| parent | copied Noctigon K1 -> MD11 to start defining a new light (diff) | |
| download | anduril-acf62345e94439df0212c388d5e7143a50005825.tar.gz anduril-acf62345e94439df0212c388d5e7143a50005825.tar.bz2 anduril-acf62345e94439df0212c388d5e7143a50005825.zip | |
just a few adjustments to start with
| -rw-r--r-- | hwdef-Noctigon_MD11.h | 16 | ||||
| -rw-r--r-- | spaghetti-monster/anduril/cfg-noctigon-md11.h | 23 |
2 files changed, 22 insertions, 17 deletions
diff --git a/hwdef-Noctigon_MD11.h b/hwdef-Noctigon_MD11.h index 4c0ce05..ecd9f10 100644 --- a/hwdef-Noctigon_MD11.h +++ b/hwdef-Noctigon_MD11.h @@ -1,15 +1,15 @@ -#ifndef HWDEF_NOCTIGON_K1_H -#define HWDEF_NOCTIGON_K1_H +#ifndef HWDEF_NOCTIGON_MD11_H +#define HWDEF_NOCTIGON_MD11_H -/* Noctigon K1 driver layout (attiny1634) - * (originally known as Emisar D1S V2) +/* Noctigon MD11 driver layout (attiny1634) + * (based on Noctigon K1) * * Pin / Name / Function * 1 PA6 (none) (PWM1B) (reserved for DD drivers) * 2 PA5 R: red aux LED (PWM0B) * 3 PA4 G: green aux LED * 4 PA3 B: blue aux LED - * 5 PA2 (none) (reserved for L: button LED (on some models)) + * 5 PA2 L: button LED * 6 PA1 (none) * 7 PA0 (none) * 8 GND GND @@ -95,6 +95,11 @@ #define AUXLED_RGB_DDR DDRA // DDRA or DDRB or DDRC #define AUXLED_RGB_PUE PUEA // PUEA or PUEB or PUEC +#define BUTTON_LED_PIN PA2 // pin 5 +#define BUTTON_LED_PORT PORTA // for all "PA" pins +#define BUTTON_LED_DDR DDRA // for all "PA" pins +#define BUTTON_LED_PUE PUEA // for all "PA" pins + // with so many pins, doing this all with #ifdefs gets awkward... // ... so just hardcode it in each hwdef file instead inline void hwdef_setup() { @@ -106,6 +111,7 @@ inline void hwdef_setup() { DDRA = (1 << AUXLED_R_PIN) | (1 << AUXLED_G_PIN) | (1 << AUXLED_B_PIN) + | (1 << BUTTON_LED_PIN) ; // configure PWM diff --git a/spaghetti-monster/anduril/cfg-noctigon-md11.h b/spaghetti-monster/anduril/cfg-noctigon-md11.h index fb2a89c..ba72607 100644 --- a/spaghetti-monster/anduril/cfg-noctigon-md11.h +++ b/spaghetti-monster/anduril/cfg-noctigon-md11.h @@ -1,18 +1,17 @@ -// Noctigon K1 config options for Anduril -#define MODEL_NUMBER "0251" -// (originally known as Emisar D1S v2) -#include "hwdef-Noctigon_K1.h" +// Noctigon MD11 config options for Anduril +#define MODEL_NUMBER "0271" +#include "hwdef-Noctigon_MD11.h" #include "hank-cfg.h" // ATTINY: 1634 -// this light can safely run a bit hotter than most -#undef DEFAULT_THERM_CEIL -#define DEFAULT_THERM_CEIL 55 - // this light has three aux LED channels: R, G, B #define USE_AUX_RGB_LEDS -#define USE_AUX_RGB_LEDS_WHILE_ON -#define USE_INDICATOR_LED_WHILE_RAMPING +// ... and a single LED in the button +#define USE_BUTTON_LED +// don't use aux LEDs while main LED is on +#ifdef USE_INDICATOR_LED_WHILE_RAMPING +#undef USE_INDICATOR_LED_WHILE_RAMPING +#endif // ../../bin/level_calc.py cube 1 150 7135 1 4 1300 @@ -51,8 +50,8 @@ // stop panicking at ~70% power or ~600 lm #define THERM_FASTER_LEVEL 130 -#define THERM_RESPONSE_MAGNITUDE 32 // smaller adjustments, this host changes temperature slowly -#define THERM_NEXT_WARNING_THRESHOLD 32 // more error tolerance before adjusting +//#define THERM_RESPONSE_MAGNITUDE 32 // smaller adjustments, this host changes temperature slowly +//#define THERM_NEXT_WARNING_THRESHOLD 32 // more error tolerance before adjusting // slow down party strobe; this driver can't pulse for 1ms or less #define PARTY_STROBE_ONTIME 2 |