diff options
| author | Selene ToyKeeper | 2020-04-29 01:40:25 -0600 |
|---|---|---|
| committer | Selene ToyKeeper | 2020-04-29 01:40:25 -0600 |
| commit | 635d013abd690315e4e57caf1f47f1f06b6eba58 (patch) | |
| tree | 11cf2b61ddb00de957fe815dcd8bd373a3958618 | |
| parent | merged Noctigon KR4 and K1-12V (XHP35) branches (diff) | |
| download | anduril-635d013abd690315e4e57caf1f47f1f06b6eba58.tar.gz anduril-635d013abd690315e4e57caf1f47f1f06b6eba58.tar.bz2 anduril-635d013abd690315e4e57caf1f47f1f06b6eba58.zip | |
removed unused TEMP_CHANNEL thing from FSM-related code
| -rw-r--r-- | hwdef-BLF_GT.h | 2 | ||||
| -rw-r--r-- | hwdef-Emisar_D18.h | 3 | ||||
| -rw-r--r-- | hwdef-Emisar_D4.h | 3 | ||||
| -rw-r--r-- | hwdef-Emisar_D4Sv2.h | 2 | ||||
| -rw-r--r-- | hwdef-Emisar_D4v2.h | 2 | ||||
| -rw-r--r-- | hwdef-FW3A.h | 3 | ||||
| -rw-r--r-- | hwdef-Mateminco_MF01-Mini.h | 2 | ||||
| -rw-r--r-- | hwdef-Mateminco_MF01S.h | 2 | ||||
| -rw-r--r-- | hwdef-Noctigon_K1-12V.h | 2 | ||||
| -rw-r--r-- | hwdef-Noctigon_K1.h | 2 | ||||
| -rw-r--r-- | hwdef-Noctigon_KR4.h | 2 | ||||
| -rw-r--r-- | hwdef-TK_Saber.h | 3 | ||||
| -rw-r--r-- | tk-attiny.h | 5 |
13 files changed, 3 insertions, 30 deletions
diff --git a/hwdef-BLF_GT.h b/hwdef-BLF_GT.h index 99adc8f..51b391d 100644 --- a/hwdef-BLF_GT.h +++ b/hwdef-BLF_GT.h @@ -52,8 +52,6 @@ #define ADC_22 (92*4) #endif -#define TEMP_CHANNEL 0b00001111 - #define FAST 0xA3 // fast PWM both channels #define PHASE 0xA1 // phase-correct PWM both channels diff --git a/hwdef-Emisar_D18.h b/hwdef-Emisar_D18.h index 3046143..3a238eb 100644 --- a/hwdef-Emisar_D18.h +++ b/hwdef-Emisar_D18.h @@ -40,9 +40,6 @@ #define VOLTAGE_FUDGE_FACTOR 5 // add 0.25V #endif -//#define TEMP_DIDR ADC4D -#define TEMP_CHANNEL 0b00001111 - #define FAST 0xA3 // fast PWM both channels #define PHASE 0xA1 // phase-correct PWM both channels diff --git a/hwdef-Emisar_D4.h b/hwdef-Emisar_D4.h index d3b6802..d062d6f 100644 --- a/hwdef-Emisar_D4.h +++ b/hwdef-Emisar_D4.h @@ -41,9 +41,6 @@ #define VOLTAGE_FUDGE_FACTOR 5 // add 0.25V #endif -//#define TEMP_DIDR ADC4D -#define TEMP_CHANNEL 0b00001111 - #define FAST 0xA3 // fast PWM both channels #define PHASE 0xA1 // phase-correct PWM both channels diff --git a/hwdef-Emisar_D4Sv2.h b/hwdef-Emisar_D4Sv2.h index 7c3fe86..d68b7ac 100644 --- a/hwdef-Emisar_D4Sv2.h +++ b/hwdef-Emisar_D4Sv2.h @@ -59,8 +59,6 @@ #define VOLTAGE_FUDGE_FACTOR 4 // add 0.20V (measured 0.22V) #endif -#define TEMP_CHANNEL 0b00001111 - // this light has aux LEDs under the optic #define AUXLED_R_PIN PA5 // pin 2 #define AUXLED_G_PIN PA4 // pin 3 diff --git a/hwdef-Emisar_D4v2.h b/hwdef-Emisar_D4v2.h index 60f3fae..fc95e22 100644 --- a/hwdef-Emisar_D4v2.h +++ b/hwdef-Emisar_D4v2.h @@ -55,8 +55,6 @@ #define VOLTAGE_FUDGE_FACTOR 4 // add 0.20V (measured 0.22V) #endif -#define TEMP_CHANNEL 0b00001111 - // this light has aux LEDs under the optic #define AUXLED_R_PIN PA5 // pin 2 #define AUXLED_G_PIN PA4 // pin 3 diff --git a/hwdef-FW3A.h b/hwdef-FW3A.h index a223b08..e8875d7 100644 --- a/hwdef-FW3A.h +++ b/hwdef-FW3A.h @@ -42,9 +42,6 @@ #define VOLTAGE_FUDGE_FACTOR 5 // add 0.25V #endif -//#define TEMP_DIDR ADC4D -#define TEMP_CHANNEL 0b00001111 - #define FAST 0xA3 // fast PWM both channels #define PHASE 0xA1 // phase-correct PWM both channels diff --git a/hwdef-Mateminco_MF01-Mini.h b/hwdef-Mateminco_MF01-Mini.h index 0fea1e2..c0de533 100644 --- a/hwdef-Mateminco_MF01-Mini.h +++ b/hwdef-Mateminco_MF01-Mini.h @@ -41,8 +41,6 @@ #define VOLTAGE_FUDGE_FACTOR 5 // add 0.25V #endif -#define TEMP_CHANNEL 0b00001111 - #define FAST 0xA3 // fast PWM both channels #define PHASE 0xA1 // phase-correct PWM both channels diff --git a/hwdef-Mateminco_MF01S.h b/hwdef-Mateminco_MF01S.h index cb5a416..78a64a6 100644 --- a/hwdef-Mateminco_MF01S.h +++ b/hwdef-Mateminco_MF01S.h @@ -52,8 +52,6 @@ #define ADC_22 (117*4) #endif -#define TEMP_CHANNEL 0b00001111 - #define FAST 0xA3 // fast PWM both channels #define PHASE 0xA1 // phase-correct PWM both channels diff --git a/hwdef-Noctigon_K1-12V.h b/hwdef-Noctigon_K1-12V.h index 7beb205..8781d8e 100644 --- a/hwdef-Noctigon_K1-12V.h +++ b/hwdef-Noctigon_K1-12V.h @@ -90,8 +90,6 @@ #define ADC_22 482 // manually tweaked so 4.16V will blink out 4.2 #endif -#define TEMP_CHANNEL 0b00001111 - // this light has aux LEDs under the optic #define AUXLED_R_PIN PA5 // pin 2 #define AUXLED_G_PIN PA4 // pin 3 diff --git a/hwdef-Noctigon_K1.h b/hwdef-Noctigon_K1.h index 8c8a4db..4c0ce05 100644 --- a/hwdef-Noctigon_K1.h +++ b/hwdef-Noctigon_K1.h @@ -87,8 +87,6 @@ #define ADC_22 482 // manually tweaked so 4.16V will blink out 4.2 #endif -#define TEMP_CHANNEL 0b00001111 - // this light has aux LEDs under the optic #define AUXLED_R_PIN PA5 // pin 2 #define AUXLED_G_PIN PA4 // pin 3 diff --git a/hwdef-Noctigon_KR4.h b/hwdef-Noctigon_KR4.h index 4eec585..073fe27 100644 --- a/hwdef-Noctigon_KR4.h +++ b/hwdef-Noctigon_KR4.h @@ -97,8 +97,6 @@ #define ADC_22 482 // manually tweaked so 4.16V will blink out 4.2 #endif -#define TEMP_CHANNEL 0b00001111 - // this light has aux LEDs under the optic #define AUXLED_R_PIN PA5 // pin 2 #define AUXLED_G_PIN PA4 // pin 3 diff --git a/hwdef-TK_Saber.h b/hwdef-TK_Saber.h index 9458398..e6476b8 100644 --- a/hwdef-TK_Saber.h +++ b/hwdef-TK_Saber.h @@ -28,9 +28,6 @@ // average drop across diode on this hardware #define VOLTAGE_FUDGE_FACTOR 5 // add 0.25V -//#define TEMP_DIDR ADC4D -#define TEMP_CHANNEL 0b00001111 - #define FAST 0xA3 // fast PWM both channels #define PHASE 0xA1 // phase-correct PWM both channels diff --git a/tk-attiny.h b/tk-attiny.h index 76c9c9b..49f1195 100644 --- a/tk-attiny.h +++ b/tk-attiny.h @@ -63,9 +63,10 @@ #define F_CPU 8000000UL #define V_REF REFS1 #define BOGOMIPS (F_CPU/4000) - // (1 << V_REF) | (0 << ADLAR) | (VCC_CHANNEL) + // DS table 19-3, 19-4, 1.1V ref / VCC #define ADMUX_VCC 0b00001101 - // (1 << V_REF) | (0 << ADLAR) | (THERM_CHANNEL) + // (1 << V_REF) | (THERM_CHANNEL) + // DS table 19-3, 19-4, internal sensor / 1.1V ref #define ADMUX_THERM 0b10001110 #define DELAY_ZERO_TIME 1020 //#define SWITCH_PORT PINA // set this in hwdef |