From 0cc485438d75143e0d08757103dc4e5615caae51 Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Thu, 1 Apr 2021 18:59:11 -0600 Subject: Renamed gchart-fet1-t16 to t1616, to make it consistent with other t1616 models. --- hwdef-gchart-fet1-t1616.h | 99 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 hwdef-gchart-fet1-t1616.h (limited to 'hwdef-gchart-fet1-t1616.h') diff --git a/hwdef-gchart-fet1-t1616.h b/hwdef-gchart-fet1-t1616.h new file mode 100644 index 0000000..43255d8 --- /dev/null +++ b/hwdef-gchart-fet1-t1616.h @@ -0,0 +1,99 @@ +#ifndef HWDEF_GCH_FET1_T1616_H +#define HWDEF_GCH_FET1_T1616_H + +/* gChart's custom FET+1 driver layout + +PB0 - PWM for FET (TCA - WO0) +PB1 - PWM for 7135 (TCA - WO1) +PB2 - Switch pin, internal pullup +PB3 - Aux LED with 4700 Ohm series resistor +Read voltage from VCC pin, has diode with ~0.4v drop + +*/ + + +#define LAYOUT_DEFINED + +#ifdef ATTINY +#undef ATTINY +#endif +#define ATTINY 1616 +#include + +#define PWM_CHANNELS 2 + +#ifndef SWITCH_PIN +#define SWITCH_PIN PIN2_bp +#define SWITCH_PORT VPORTB.IN +#define SWITCH_ISC_REG PORTB.PIN2CTRL +#define SWITCH_VECT PORTB_PORT_vect +#define SWITCH_INTFLG VPORTB.INTFLAGS +#endif + + +// 7135 channel +#ifndef PWM1_PIN +#define PWM1_PIN PB1 // +#define PWM1_LVL TCA0.SINGLE.CMP1 // CMP1 is the output compare register for PB1 +#endif + +// FET channel +#ifndef PWM2_PIN +#define PWM2_PIN PB0 // +#define PWM2_LVL TCA0.SINGLE.CMP0 // CMP0 is the output compare register for PB0 +#endif + +// average drop across diode on this hardware +#ifndef VOLTAGE_FUDGE_FACTOR +#define VOLTAGE_FUDGE_FACTOR 8 // 4 = add 0.20V +#endif + + +// lighted button +#ifndef AUXLED_PIN +#define AUXLED_PIN PIN3_bp +#define AUXLED_PORT PORTB +#endif + + +// with so many pins, doing this all with #ifdefs gets awkward... +// ... so just hardcode it in each hwdef file instead +inline void hwdef_setup() { + + // set up the system clock to run at 5 MHz instead of the default 3.33 MHz + _PROTECTED_WRITE( CLKCTRL.MCLKCTRLB, CLKCTRL_PDIV_4X_gc | CLKCTRL_PEN_bm ); + + //VPORTA.DIR = 0b00000010; + VPORTB.DIR = PIN0_bm | PIN1_bm | PIN3_bm; + //VPORTC.DIR = 0b00000000; + + // enable pullups on the input pins to reduce power + PORTA.PIN0CTRL = PORT_PULLUPEN_bm; + PORTA.PIN1CTRL = PORT_PULLUPEN_bm; + PORTA.PIN2CTRL = PORT_PULLUPEN_bm; + PORTA.PIN3CTRL = PORT_PULLUPEN_bm; + PORTA.PIN4CTRL = PORT_PULLUPEN_bm; + PORTA.PIN5CTRL = PORT_PULLUPEN_bm; + PORTA.PIN6CTRL = PORT_PULLUPEN_bm; + PORTA.PIN7CTRL = PORT_PULLUPEN_bm; + + //PORTB.PIN0CTRL = PORT_PULLUPEN_bm; // FET channel + //PORTB.PIN1CTRL = PORT_PULLUPEN_bm; // 7135 channel + PORTB.PIN2CTRL = PORT_PULLUPEN_bm | PORT_ISC_BOTHEDGES_gc; // switch + //PORTB.PIN3CTRL = PORT_PULLUPEN_bm; // Aux LED + PORTB.PIN4CTRL = PORT_PULLUPEN_bm; + PORTB.PIN5CTRL = PORT_PULLUPEN_bm; + + PORTC.PIN0CTRL = PORT_PULLUPEN_bm; + PORTC.PIN1CTRL = PORT_PULLUPEN_bm; + PORTC.PIN2CTRL = PORT_PULLUPEN_bm; + PORTC.PIN3CTRL = PORT_PULLUPEN_bm; + + // set up the PWM + TCA0.SINGLE.CTRLB = TCA_SINGLE_CMP0EN_bm | TCA_SINGLE_CMP1EN_bm | TCA_SINGLE_WGMODE_SINGLESLOPE_gc; + TCA0.SINGLE.PER = 255; + TCA0.SINGLE.CTRLA = TCA_SINGLE_CLKSEL_DIV1_gc | TCA_SINGLE_ENABLE_bm; +} + + +#endif -- cgit v1.2.3 From 85a7115dea0082468d72883587209a33dddeddd0 Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Thu, 1 Apr 2021 22:01:28 -0600 Subject: minor formatting cleanup on t1616 hwdef files --- hwdef-gchart-fet1-t1616.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'hwdef-gchart-fet1-t1616.h') diff --git a/hwdef-gchart-fet1-t1616.h b/hwdef-gchart-fet1-t1616.h index 43255d8..3d41951 100644 --- a/hwdef-gchart-fet1-t1616.h +++ b/hwdef-gchart-fet1-t1616.h @@ -23,7 +23,7 @@ Read voltage from VCC pin, has diode with ~0.4v drop #define PWM_CHANNELS 2 #ifndef SWITCH_PIN -#define SWITCH_PIN PIN2_bp +#define SWITCH_PIN PIN2_bp #define SWITCH_PORT VPORTB.IN #define SWITCH_ISC_REG PORTB.PIN2CTRL #define SWITCH_VECT PORTB_PORT_vect @@ -33,13 +33,13 @@ Read voltage from VCC pin, has diode with ~0.4v drop // 7135 channel #ifndef PWM1_PIN -#define PWM1_PIN PB1 // +#define PWM1_PIN PB1 // #define PWM1_LVL TCA0.SINGLE.CMP1 // CMP1 is the output compare register for PB1 #endif // FET channel #ifndef PWM2_PIN -#define PWM2_PIN PB0 // +#define PWM2_PIN PB0 // #define PWM2_LVL TCA0.SINGLE.CMP0 // CMP0 is the output compare register for PB0 #endif @@ -60,8 +60,8 @@ Read voltage from VCC pin, has diode with ~0.4v drop // ... so just hardcode it in each hwdef file instead inline void hwdef_setup() { - // set up the system clock to run at 5 MHz instead of the default 3.33 MHz - _PROTECTED_WRITE( CLKCTRL.MCLKCTRLB, CLKCTRL_PDIV_4X_gc | CLKCTRL_PEN_bm ); + // set up the system clock to run at 5 MHz instead of the default 3.33 MHz + _PROTECTED_WRITE( CLKCTRL.MCLKCTRLB, CLKCTRL_PDIV_4X_gc | CLKCTRL_PEN_bm ); //VPORTA.DIR = 0b00000010; VPORTB.DIR = PIN0_bm | PIN1_bm | PIN3_bm; @@ -76,20 +76,21 @@ inline void hwdef_setup() { PORTA.PIN5CTRL = PORT_PULLUPEN_bm; PORTA.PIN6CTRL = PORT_PULLUPEN_bm; PORTA.PIN7CTRL = PORT_PULLUPEN_bm; - + //PORTB.PIN0CTRL = PORT_PULLUPEN_bm; // FET channel //PORTB.PIN1CTRL = PORT_PULLUPEN_bm; // 7135 channel PORTB.PIN2CTRL = PORT_PULLUPEN_bm | PORT_ISC_BOTHEDGES_gc; // switch //PORTB.PIN3CTRL = PORT_PULLUPEN_bm; // Aux LED PORTB.PIN4CTRL = PORT_PULLUPEN_bm; PORTB.PIN5CTRL = PORT_PULLUPEN_bm; - + PORTC.PIN0CTRL = PORT_PULLUPEN_bm; PORTC.PIN1CTRL = PORT_PULLUPEN_bm; PORTC.PIN2CTRL = PORT_PULLUPEN_bm; PORTC.PIN3CTRL = PORT_PULLUPEN_bm; - - // set up the PWM + + // set up the PWM + // TODO: add references to MCU documentation TCA0.SINGLE.CTRLB = TCA_SINGLE_CMP0EN_bm | TCA_SINGLE_CMP1EN_bm | TCA_SINGLE_WGMODE_SINGLESLOPE_gc; TCA0.SINGLE.PER = 255; TCA0.SINGLE.CTRLA = TCA_SINGLE_CLKSEL_DIV1_gc | TCA_SINGLE_ENABLE_bm; -- cgit v1.2.3 From a3b9184af454f85da688e8975e248c69418bca02 Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Fri, 2 Apr 2021 14:07:02 -0600 Subject: need to do some measurements sometime to determine if fast or phase-correct PWM is better on t1616 --- hwdef-gchart-fet1-t1616.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'hwdef-gchart-fet1-t1616.h') diff --git a/hwdef-gchart-fet1-t1616.h b/hwdef-gchart-fet1-t1616.h index 3d41951..365ecd7 100644 --- a/hwdef-gchart-fet1-t1616.h +++ b/hwdef-gchart-fet1-t1616.h @@ -91,6 +91,9 @@ inline void hwdef_setup() { // set up the PWM // TODO: add references to MCU documentation + // TODO: measure 5 MHz fast PWM vs 10 MHz phase-correct, to see if it + // still has issues at 0/255 and 255/255 like older models did + // (and maybe switch to phase-correct@10MHz) TCA0.SINGLE.CTRLB = TCA_SINGLE_CMP0EN_bm | TCA_SINGLE_CMP1EN_bm | TCA_SINGLE_WGMODE_SINGLESLOPE_gc; TCA0.SINGLE.PER = 255; TCA0.SINGLE.CTRLA = TCA_SINGLE_CLKSEL_DIV1_gc | TCA_SINGLE_ENABLE_bm; -- cgit v1.2.3