Merge branch 'avr32dd20-devkit' into trunk

Added support for AVR DD MCUs, particularly avr32dd20.  Also did a bunch
of refactoring for how MCU support works, cleaned up the ADC code,
switched to consistent internal formats for voltage and temperature,
fixed the FW3X, and some other little things.

* avr32dd20-devkit: (28 commits)
  eliminated direct CCP register access from arch/attiny1616
  made the avr32dd20 flashing script more universal
  added a build target for FW3X with manually-fixed RGB aux wiring
  prevent future issues like the FW3X had
  fixed FW3X thermal regulation
  fixed incorrect temperature history for a few seconds after waking
  fsm/adc: removed dead code
  FW3X: fixed external temperature sensor
  FW3X: multiple upgrades...
  fw3x: fixed swapped red+blue, fixed battery measurements, added police color strobe
  fixed ADC on sp10-pro
  fixed ADC on attiny85 and related builds
  fixed ADC on attiny1634 and related builds
  more ADC / DAC / MCU progress...
  avr32dd20-devkit: make the defaults a bit more dev friendly (realtime voltage colors, and no simple UI by default)
  ADC voltage: battcheck 3 digits, fixed t1616, switched back to 8-bit internal volt unit
  got ADC voltage+temp working on avrdd... but broke all other builds/MCUs
  1.55V AA battery should not show as "white" voltage color, only purple
  started refactoring fsm/adc.*, but need a checkpoint before continuing
  added dac-scale.py: short script to calculate avrdd DAC+Vref values from level_calc.py ramp data
  ...

1 files changed, 4 insertions, 108 deletions

diff --git a/fsm/main.c b/fsm/main.c
index 0524115..bb93862 100644
--- a/fsm/main.c
+++ b/fsm/main.c
@@ -6,108 +6,16 @@
 
 #include "fsm/main.h"
 
-#if PWM_CHANNELS == 4
-#ifdef AVRXMEGA3  // ATTINY816, 817, etc
-#error 4-channel PWM not currently set up for the AVR 1-Series
-#endif
-// 4th PWM channel requires manually turning the pin on/off via interrupt :(
-ISR(TIMER1_OVF_vect) {
-    //bitClear(PORTB, 3);
-    PORTB &= 0b11110111;
-    //PORTB |= 0b00001000;
-}
-ISR(TIMER1_COMPA_vect) {
-    //if (!bitRead(TIFR,TOV1)) bitSet(PORTB, 3);
-    if (! (TIFR & (1<<TOV1))) PORTB |= 0b00001000;
-    //if (! (TIFR & (1<<TOV1))) PORTB &= 0b11110111;
-}
-#endif
-
-// FIXME: hw_setup() shouldn't be here ... move it entirely to hwdef files
-#if (ATTINY == 25) || (ATTINY == 45) || (ATTINY == 85)
-static inline void hw_setup() {
-    #if !defined(USE_GENERIC_HWDEF_SETUP)
-        hwdef_setup();
-    #else
-        // configure PWM channels
-        #if PWM_CHANNELS >= 1
-            DDRB |= (1 << PWM1_PIN);
-            TCCR0B = 0x01; // pre-scaler for timer (1 => 1, 2 => 8, 3 => 64...)
-            TCCR0A = PHASE;
-            #if (PWM1_PIN == PB4) // Second PWM counter is ... weird
-                TCCR1 = _BV (CS10);
-                GTCCR = _BV (COM1B1) | _BV (PWM1B);
-                OCR1C = 255;  // Set ceiling value to maximum
-            #endif
-        #endif
-        // tint ramping needs second channel enabled,
-        // despite PWM_CHANNELS being only 1
-        #if (PWM_CHANNELS >= 2) || defined(USE_TINT_RAMPING)
-            DDRB |= (1 << PWM2_PIN);
-            #if (PWM2_PIN == PB4) // Second PWM counter is ... weird
-                TCCR1 = _BV (CS10);
-                GTCCR = _BV (COM1B1) | _BV (PWM1B);
-                OCR1C = 255;  // Set ceiling value to maximum
-            #endif
-        #endif
-        #if PWM_CHANNELS >= 3
-            DDRB |= (1 << PWM3_PIN);
-            #if (PWM3_PIN == PB4) // Second PWM counter is ... weird
-                TCCR1 = _BV (CS10);
-                GTCCR = _BV (COM1B1) | _BV (PWM1B);
-                OCR1C = 255;  // Set ceiling value to maximum
-            #endif
-        #endif
-        #if PWM_CHANNELS >= 4
-            // 4th PWM channel is ... not actually supported in hardware  :(
-            DDRB |= (1 << PWM4_PIN);
-            //OCR1C = 255;  // Set ceiling value to maximum
-            TCCR1 = 1<<CTC1 | 1<<PWM1A | 3<<COM1A0 | 2<<CS10;
-            GTCCR = (2<<COM1B0) | (1<<PWM1B);
-            // set up an interrupt to control PWM4 pin
-            TIMSK |= (1<<OCIE1A) | (1<<TOIE1);
-        #endif
-
-        // configure e-switch
-        PORTB = (1 << SWITCH_PIN);  // e-switch is the only input
-        PCMSK = (1 << SWITCH_PIN);  // pin change interrupt uses this pin
-    #endif  // ifdef USE_GENERIC_HWDEF_SETUP
-}
-#elif (ATTINY == 1634) || defined(AVRXMEGA3)  // ATTINY816, 817, etc
-static inline void hw_setup() {
-    // this gets tricky with so many pins...
-    // ... so punt it to the hwdef file
-    hwdef_setup();
-}
-#else
-    #error Unrecognized MCU type
-#endif
-
-
-//#ifdef USE_REBOOT
-static inline void prevent_reboot_loop() {
-    // prevent WDT from rebooting MCU again
-    #ifdef AVRXMEGA3  // ATTINY816, 817, etc
-    RSTCTRL.RSTFR &= ~(RSTCTRL_WDRF_bm);  // reset status flag
-    #else
-    MCUSR &= ~(1<<WDRF);  // reset status flag
-    #endif
-    wdt_disable();
-}
-//#endif
-
 
 int main() {
     // Don't allow interrupts while booting
     cli();
 
-    //#ifdef USE_REBOOT
     // prevents cycling after a crash,
     // whether intentional (like factory reset) or not (bugs)
     prevent_reboot_loop();
-    //#endif
 
-    hw_setup();
+    hwdef_setup();
 
     #if 0
     #ifdef HALFSPEED
@@ -124,6 +32,9 @@ int main() {
 
     // all booted -- turn interrupts back on
     PCINT_on();
+    // FIXME: support both WDT *and* RTC PIT on newer devices
+    // (WDT to recover from crashes, PIT for task scheduling)
+    // (old AVR had only WDT, newer ones split it into WDT, RTC, and PIT)
     WDT_on();
     ADC_on();
     sei();
@@ -160,22 +71,7 @@ int main() {
         // enter standby mode if requested
         // (works better if deferred like this)
         if (go_to_standby) {
-            #ifdef USE_RAMPING
             set_level(0);
-            #else
-            #if PWM_CHANNELS >= 1
-            PWM1_LVL = 0;
-            #endif
-            #if PWM_CHANNELS >= 2
-            PWM2_LVL = 0;
-            #endif
-            #if PWM_CHANNELS >= 3
-            PWM3_LVL = 0;
-            #endif
-            #if PWM_CHANNELS >= 4
-            PWM4_LVL = 255;  // inverted  :(
-            #endif
-            #endif
             standby_mode();
         }