From ccf3833849aafe9ea54f89f283e7c9adb8ef5dfe Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Tue, 7 Sep 2021 16:28:14 -0600 Subject: copied hwdef from K9.3 for new tint-ramping D4Sv2 --- hwdef-Emisar_D4Sv2-tintramp.h | 164 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) create mode 100644 hwdef-Emisar_D4Sv2-tintramp.h (limited to 'hwdef-Emisar_D4Sv2-tintramp.h') diff --git a/hwdef-Emisar_D4Sv2-tintramp.h b/hwdef-Emisar_D4Sv2-tintramp.h new file mode 100644 index 0000000..6032b4c --- /dev/null +++ b/hwdef-Emisar_D4Sv2-tintramp.h @@ -0,0 +1,164 @@ +#ifndef HWDEF_NOCTIGON_K93_H +#define HWDEF_NOCTIGON_K93_H + +/* Noctigon K9.3 driver layout (attiny1634) + * + * Pin / Name / Function + * 1 PA6 2nd LED PWM (linear) (PWM1B) + * 2 PA5 R: red aux LED (PWM0B) + * 3 PA4 G: green aux LED + * 4 PA3 B: blue aux LED + * 5 PA2 button LED + * 6 PA1 Opamp 2 enable (2nd LEDs) + * 7 PA0 Opamp 1 enable (main LEDs) + * 8 GND GND + * 9 VCC VCC + * 10 PC5 (none) + * 11 PC4 (none) + * 12 PC3 RESET + * 13 PC2 (none) + * 14 PC1 SCK + * 15 PC0 main LED PWM (FET) (PWM0A) + * 16 PB3 main LED PWM (linear) (PWM1A) + * 17 PB2 MISO + * 18 PB1 MOSI / battery voltage (ADC6) + * 19 PB0 (none) + * 20 PA7 e-switch (PCINT7) + * ADC12 thermal sensor + * + * Main LED power uses one pin to turn the Opamp on/off, + * and one pin to control Opamp power level. + * Main brightness control uses the power level pin, with 4 kHz 10-bit PWM. + * The on/off pin is only used to turn the main LED on and off, + * not to change brightness. + * Some models also have a direct-drive FET for turbo. + */ + +#ifdef ATTINY +#undef ATTINY +#endif +#define ATTINY 1634 +#include + +#define PWM_CHANNELS 3 // 2 for main LEDs, 1 for 2nd LEDs +#define PWM_BITS 10 // 0 to 1023 at 4 kHz, not 0 to 255 at 16 kHz +#define PWM_TOP 1023 + +#define SWITCH_PIN PA7 // pin 20 +#define SWITCH_PCINT PCINT7 // pin 20 pin change interrupt +#define SWITCH_PCIE PCIE0 // PCIE1 is for PCINT[7:0] +#define SWITCH_PCMSK PCMSK0 // PCMSK1 is for PCINT[7:0] +#define SWITCH_PORT PINA // PINA or PINB or PINC +#define PCINT_vect PCINT0_vect // ISR for PCINT[7:0] + +#define PWM1_PIN PB3 // pin 16, Opamp reference +#define PWM1_LVL OCR1A // OCR1A is the output compare register for PB3 + +#define PWM2_PIN PC0 // pin 15, DD FET PWM +#define PWM2_LVL OCR0A // OCR0A is the output compare register for PC0 + +#define PWM3_PIN PA6 // pin 1, 2nd LED Opamp reference +#define PWM3_LVL OCR1B // OCR1B is the output compare register for PA6 + +#define LED_ENABLE_PIN PA0 // pin 7, Opamp power +#define LED_ENABLE_PORT PORTA // control port for PA0 + +#define LED2_ENABLE_PIN PA1 // pin 6, Opamp power +#define LED2_ENABLE_PORT PORTA // control port for PA1 + + +#define USE_VOLTAGE_DIVIDER // use a dedicated pin, not VCC, because VCC input is flattened +#define VOLTAGE_PIN PB1 // Pin 18 / PB1 / ADC6 +// pin to ADC mappings are in DS table 19-4 +#define VOLTAGE_ADC ADC6D // digital input disable pin for PB1 +// DIDR0/DIDR1 mappings are in DS section 19.13.5, 19.13.6 +#define VOLTAGE_ADC_DIDR DIDR1 // DIDR channel for ADC6D +// DS tables 19-3, 19-4 +// Bit 7 6 5 4 3 2 1 0 +// REFS1 REFS0 REFEN ADC0EN MUX3 MUX2 MUX1 MUX0 +// MUX[3:0] = 0, 1, 1, 0 for ADC6 / PB1 +// divided by ... +// REFS[1:0] = 1, 0 for internal 1.1V reference +// other bits reserved +#define ADMUX_VOLTAGE_DIVIDER 0b10000110 +#define ADC_PRSCL 0x07 // clk/128 + +// Raw ADC readings at 4.4V and 2.2V +// calibrate the voltage readout here +// estimated / calculated values are: +// (voltage - D1) * (R2/(R2+R1) * 1024 / 1.1) +// D1, R1, R2 = 0, 330, 100 +#ifndef ADC_44 +//#define ADC_44 981 // raw value at 4.40V +#define ADC_44 967 // manually tweaked so 4.16V will blink out 4.2 +#endif +#ifndef ADC_22 +//#define ADC_22 489 // raw value at 2.20V +#define ADC_22 482 // manually tweaked so 4.16V will blink out 4.2 +#endif + +// this light has aux LEDs under the optic +#define AUXLED_R_PIN PA5 // pin 2 +#define AUXLED_G_PIN PA4 // pin 3 +#define AUXLED_B_PIN PA3 // pin 4 +#define AUXLED_RGB_PORT PORTA // PORTA or PORTB or PORTC +#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() { + // enable output ports + DDRC = (1 << PWM2_PIN); + DDRB = (1 << PWM1_PIN); + DDRA = (1 << PWM3_PIN) + | (1 << AUXLED_R_PIN) + | (1 << AUXLED_G_PIN) + | (1 << AUXLED_B_PIN) + | (1 << BUTTON_LED_PIN) + | (1 << LED_ENABLE_PIN) + | (1 << LED2_ENABLE_PIN) + ; + + // configure PWM + // Setup PWM. F_pwm = F_clkio / 2 / N / TOP, where N = prescale factor, TOP = top of counter + // pre-scale for timer: N = 1 + // Linear opamp PWM for both main and 2nd LEDs (10-bit) + // WGM1[3:0]: 0,0,1,1: PWM, Phase Correct, 10-bit (DS table 12-5) + // CS1[2:0]: 0,0,1: clk/1 (No prescaling) (DS table 12-6) + // COM1A[1:0]: 1,0: PWM OC1A in the normal direction (DS table 12-4) + // COM1B[1:0]: 1,0: PWM OC1B in the normal direction (DS table 12-4) + TCCR1A = (1< -#define PWM_CHANNELS 3 // 2 for main LEDs, 1 for 2nd LEDs -#define PWM_BITS 10 // 0 to 1023 at 4 kHz, not 0 to 255 at 16 kHz -#define PWM_TOP 1023 +#define PWM_CHANNELS 2 // 1 for main LEDs, 1 for 2nd LEDs +#define PWM_BITS 12 // 0 to 4095 at 1 kHz, not 0 to 255 at 16 kHz +#define PWM_TOP 4095 +// TODO: dynamic PWM with tint ramping +//#define USE_DYN_PWM // dynamic frequency and speed #define SWITCH_PIN PA7 // pin 20 #define SWITCH_PCINT PCINT7 // pin 20 pin change interrupt @@ -53,12 +55,16 @@ #define PWM1_PIN PB3 // pin 16, Opamp reference #define PWM1_LVL OCR1A // OCR1A is the output compare register for PB3 +#define PWM1_CNT TCNT1 // for dynamic PWM, reset phase -#define PWM2_PIN PC0 // pin 15, DD FET PWM -#define PWM2_LVL OCR0A // OCR0A is the output compare register for PC0 +#define PWM2_PIN PA6 // pin 1, 2nd LED Opamp reference +#define PWM2_LVL OCR1B // OCR1B is the output compare register for PA6 -#define PWM3_PIN PA6 // pin 1, 2nd LED Opamp reference -#define PWM3_LVL OCR1B // OCR1B is the output compare register for PA6 +#define PWM3_PIN PC0 // pin 15, DD FET PWM +#define PWM3_LVL OCR0A // OCR0A is the output compare register for PC0 + +// PWM parameters of both channels are tied together because they share a counter +#define PWM1_TOP ICR1 // holds the TOP value for for variable-resolution PWM #define LED_ENABLE_PIN PA0 // pin 7, Opamp power #define LED_ENABLE_PORT PORTA // control port for PA0 @@ -114,9 +120,9 @@ // ... so just hardcode it in each hwdef file instead inline void hwdef_setup() { // enable output ports - DDRC = (1 << PWM2_PIN); + DDRC = (1 << PWM3_PIN); DDRB = (1 << PWM1_PIN); - DDRA = (1 << PWM3_PIN) + DDRA = (1 << PWM2_PIN) | (1 << AUXLED_R_PIN) | (1 << AUXLED_G_PIN) | (1 << AUXLED_B_PIN) @@ -129,16 +135,16 @@ inline void hwdef_setup() { // Setup PWM. F_pwm = F_clkio / 2 / N / TOP, where N = prescale factor, TOP = top of counter // pre-scale for timer: N = 1 // Linear opamp PWM for both main and 2nd LEDs (10-bit) - // WGM1[3:0]: 0,0,1,1: PWM, Phase Correct, 10-bit (DS table 12-5) + // WGM1[3:0]: 1,0,1,0: PWM, Phase Correct, adjustable (DS table 12-5) // CS1[2:0]: 0,0,1: clk/1 (No prescaling) (DS table 12-6) // COM1A[1:0]: 1,0: PWM OC1A in the normal direction (DS table 12-4) // COM1B[1:0]: 1,0: PWM OC1B in the normal direction (DS table 12-4) - TCCR1A = (1< -#define PWM_CHANNELS 2 // 1 for main LEDs, 1 for 2nd LEDs +#define PWM_CHANNELS 1 // 1 virtual channel (1 for main LEDs + 1 for 2nd LEDs) #define PWM_BITS 12 // 0 to 4095 at 1 kHz, not 0 to 255 at 16 kHz #define PWM_TOP 4095 -// TODO: dynamic PWM with tint ramping -//#define USE_DYN_PWM // dynamic frequency and speed +// dynamic PWM with tint ramping +#define USE_DYN_PWM // dynamic frequency and speed +#define PWM_DATATYPE2 uint16_t // doesn't need 32-bit math #define SWITCH_PIN PA7 // pin 20 #define SWITCH_PCINT PCINT7 // pin 20 pin change interrupt @@ -53,15 +54,20 @@ #define SWITCH_PORT PINA // PINA or PINB or PINC #define PCINT_vect PCINT0_vect // ISR for PCINT[7:0] +// usually PWM1_LVL would be a hardware register, but we need to abstract +// it out to a soft brightness value, in order to handle tint ramping +// (this allows smooth thermal regulation to work, and makes things +// otherwise simpler and easier) +uint16_t PWM1_LVL; #define PWM1_PIN PB3 // pin 16, Opamp reference -#define PWM1_LVL OCR1A // OCR1A is the output compare register for PB3 +#define TINT1_LVL OCR1A // OCR1A is the output compare register for PB3 #define PWM1_CNT TCNT1 // for dynamic PWM, reset phase #define PWM2_PIN PA6 // pin 1, 2nd LED Opamp reference -#define PWM2_LVL OCR1B // OCR1B is the output compare register for PA6 +#define TINT2_LVL OCR1B // OCR1B is the output compare register for PA6 -#define PWM3_PIN PC0 // pin 15, DD FET PWM -#define PWM3_LVL OCR0A // OCR0A is the output compare register for PC0 +//#define PWM3_PIN PC0 // pin 15, DD FET PWM +//#define PWM3_LVL OCR0A // OCR0A is the output compare register for PC0 // PWM parameters of both channels are tied together because they share a counter #define PWM1_TOP ICR1 // holds the TOP value for for variable-resolution PWM @@ -120,7 +126,7 @@ // ... so just hardcode it in each hwdef file instead inline void hwdef_setup() { // enable output ports - DDRC = (1 << PWM3_PIN); + //DDRC = (1 << PWM3_PIN); DDRB = (1 << PWM1_PIN); DDRA = (1 << PWM2_PIN) | (1 << AUXLED_R_PIN) -- cgit v1.2.3 From baee74468b044a664e80eaf4540af6d001186bce Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Wed, 8 Sep 2021 21:38:20 -0600 Subject: fixed D4Sv2-tintramp PWM_TOP (should be set to the value it needs during thermal regulation) --- hwdef-Emisar_D4Sv2-tintramp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'hwdef-Emisar_D4Sv2-tintramp.h') diff --git a/hwdef-Emisar_D4Sv2-tintramp.h b/hwdef-Emisar_D4Sv2-tintramp.h index 2b36ed4..a0300ad 100644 --- a/hwdef-Emisar_D4Sv2-tintramp.h +++ b/hwdef-Emisar_D4Sv2-tintramp.h @@ -41,8 +41,8 @@ #include #define PWM_CHANNELS 1 // 1 virtual channel (1 for main LEDs + 1 for 2nd LEDs) -#define PWM_BITS 12 // 0 to 4095 at 1 kHz, not 0 to 255 at 16 kHz -#define PWM_TOP 4095 +#define PWM_BITS 14 // 0 to 16383 at variable Hz, not 0 to 255 at 16 kHz +#define PWM_TOP 255 // dynamic PWM with tint ramping #define USE_DYN_PWM // dynamic frequency and speed #define PWM_DATATYPE2 uint16_t // doesn't need 32-bit math -- cgit v1.2.3 From 68c4818b68af698ee475611954c5cd52d030900b Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Wed, 8 Sep 2021 22:21:50 -0600 Subject: changed D4Sv2-tintramp from 255 to 511 for lowest PWM TOP value, to make its thermal regulation smoother and generally increase tint ramp resolution in middle modes (also, tried thermal regulation, and it works) --- hwdef-Emisar_D4Sv2-tintramp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'hwdef-Emisar_D4Sv2-tintramp.h') diff --git a/hwdef-Emisar_D4Sv2-tintramp.h b/hwdef-Emisar_D4Sv2-tintramp.h index a0300ad..64550c3 100644 --- a/hwdef-Emisar_D4Sv2-tintramp.h +++ b/hwdef-Emisar_D4Sv2-tintramp.h @@ -42,10 +42,10 @@ #define PWM_CHANNELS 1 // 1 virtual channel (1 for main LEDs + 1 for 2nd LEDs) #define PWM_BITS 14 // 0 to 16383 at variable Hz, not 0 to 255 at 16 kHz -#define PWM_TOP 255 +#define PWM_TOP 511 // dynamic PWM with tint ramping #define USE_DYN_PWM // dynamic frequency and speed -#define PWM_DATATYPE2 uint16_t // doesn't need 32-bit math +#define PWM_DATATYPE2 uint32_t // only needs 32-bit if ramp values go over 255 #define SWITCH_PIN PA7 // pin 20 #define SWITCH_PCINT PCINT7 // pin 20 pin change interrupt -- cgit v1.2.3 From 5405c977d887e4077e76c4ba035b4676509fec12 Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Fri, 10 Sep 2021 00:40:47 -0600 Subject: added D4Sv2-tintramp-FET build, which uses a FET on one set of LEDs for turbo modes (it's weird, but Hank wants it) also reworked gradual tint adjustment a bit, so some complex parts go in set_level() instead (probably needs more testing) --- hwdef-Emisar_D4Sv2-tintramp.h | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'hwdef-Emisar_D4Sv2-tintramp.h') diff --git a/hwdef-Emisar_D4Sv2-tintramp.h b/hwdef-Emisar_D4Sv2-tintramp.h index 64550c3..76f6097 100644 --- a/hwdef-Emisar_D4Sv2-tintramp.h +++ b/hwdef-Emisar_D4Sv2-tintramp.h @@ -19,7 +19,7 @@ * 12 PC3 RESET * 13 PC2 (none) * 14 PC1 SCK - * 15 PC0 main LED PWM (FET) (PWM0A) (unused because tint ramping) + * 15 PC0 main LED PWM (FET) (PWM0A) (unused on some models because tint ramping) * 16 PB3 main LED PWM (linear) (PWM1A) * 17 PB2 MISO * 18 PB1 MOSI / battery voltage (ADC6) @@ -63,11 +63,15 @@ uint16_t PWM1_LVL; #define TINT1_LVL OCR1A // OCR1A is the output compare register for PB3 #define PWM1_CNT TCNT1 // for dynamic PWM, reset phase -#define PWM2_PIN PA6 // pin 1, 2nd LED Opamp reference +// gah, this driver is weird... +// two linear channels are treated as one, +// while there's also a FET on one channel for turbo on half the LEDs +// so the FET needs to be "PWM2" but the second linear is "TINT2" +#define PWM3_PIN PA6 // pin 1, 2nd LED Opamp reference #define TINT2_LVL OCR1B // OCR1B is the output compare register for PA6 -//#define PWM3_PIN PC0 // pin 15, DD FET PWM -//#define PWM3_LVL OCR0A // OCR0A is the output compare register for PC0 +#define PWM2_PIN PC0 // pin 15, DD FET PWM +#define PWM2_LVL OCR0A // OCR0A is the output compare register for PC0 // PWM parameters of both channels are tied together because they share a counter #define PWM1_TOP ICR1 // holds the TOP value for for variable-resolution PWM @@ -126,9 +130,9 @@ uint16_t PWM1_LVL; // ... so just hardcode it in each hwdef file instead inline void hwdef_setup() { // enable output ports - //DDRC = (1 << PWM3_PIN); + DDRC = (1 << PWM2_PIN); DDRB = (1 << PWM1_PIN); - DDRA = (1 << PWM2_PIN) + DDRA = (1 << PWM3_PIN) | (1 << AUXLED_R_PIN) | (1 << AUXLED_G_PIN) | (1 << AUXLED_B_PIN) -- cgit v1.2.3