diff options
| author | Selene ToyKeeper | 2021-08-12 03:07:17 -0600 |
|---|---|---|
| committer | Selene ToyKeeper | 2021-08-12 03:07:17 -0600 |
| commit | ccda11dced208ffa9c9b065210c1264dcf1bcfbd (patch) | |
| tree | 388671641b1e48d7c49903482614ce8440db989e /hwdef-Noctigon_KR4.h | |
| parent | made PWM TOP value configurable at command line in level_calc.py, and added a... (diff) | |
| download | anduril-ccda11dced208ffa9c9b065210c1264dcf1bcfbd.tar.gz anduril-ccda11dced208ffa9c9b065210c1264dcf1bcfbd.tar.bz2 anduril-ccda11dced208ffa9c9b065210c1264dcf1bcfbd.zip | |
changed Noctigon KR4 from fixed to dynamic PWM TOP value, for later use
Diffstat (limited to 'hwdef-Noctigon_KR4.h')
| -rw-r--r-- | hwdef-Noctigon_KR4.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/hwdef-Noctigon_KR4.h b/hwdef-Noctigon_KR4.h index feb49e6..58492ac 100644 --- a/hwdef-Noctigon_KR4.h +++ b/hwdef-Noctigon_KR4.h @@ -62,6 +62,10 @@ #define PWM2_PIN PA6 // pin 1, DD FET PWM #define PWM2_LVL OCR1B // OCR1B is the output compare register for PA6 +// 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 PWM2_TOP ICR1 // holds the TOP value for for variable-resolution PWM + #define LED_ENABLE_PIN PB0 // pin 19, Opamp power #define LED_ENABLE_PORT PORTB // control port for PB0 @@ -131,14 +135,17 @@ inline void hwdef_setup() { // 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<<WGM11) | (1<<WGM10) // 10-bit (TOP=0x03FF) (DS table 12-5) + TCCR1A = (1<<WGM11) | (0<<WGM10) // adjustable PWM (TOP=ICR1) (DS table 12-5) | (1<<COM1A1) | (0<<COM1A0) // PWM 1A in normal direction (DS table 12-4) | (1<<COM1B1) | (0<<COM1B0) // PWM 1B in normal direction (DS table 12-4) ; TCCR1B = (0<<CS12) | (0<<CS11) | (1<<CS10) // clk/1 (no prescaling) (DS table 12-6) - | (0<<WGM13) | (0<<WGM12) // phase-correct PWM (DS table 12-5) + | (1<<WGM13) | (0<<WGM12) // phase-correct adjustable PWM (DS table 12-5) ; + // set PWM resolution + PWM1_TOP = 1023; + // set up e-switch //PORTB = (1 << SWITCH_PIN); // TODO: configure PORTA / PORTB / PORTC? PUEB = (1 << SWITCH_PIN); // pull-up for e-switch |