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, 1 insertions, 77 deletions

diff --git a/fsm/wdt.c b/fsm/wdt.c
index 64f006e..1095d44 100644
--- a/fsm/wdt.c
+++ b/fsm/wdt.c
@@ -7,85 +7,9 @@
 #include <avr/interrupt.h>
 #include <avr/wdt.h>
 
-// *** Note for the AVRXMEGA3 (1-Series, eg 816 and 817), the WDT 
-// is not used for time-based interrupts.  A new peripheral, the 
-// Periodic Interrupt Timer ("PIT") is used for this purpose.
-
-void WDT_on()
-{
-    #if (ATTINY == 25) || (ATTINY == 45) || (ATTINY == 85)
-        // interrupt every 16ms
-        //cli();                          // Disable interrupts
-        wdt_reset();                    // Reset the WDT
-        WDTCR |= (1<<WDCE) | (1<<WDE);  // Start timed sequence
-        WDTCR = (1<<WDIE);              // Enable interrupt every 16ms
-        //sei();                          // Enable interrupts
-    #elif (ATTINY == 1634)
-        wdt_reset();                    // Reset the WDT
-        WDTCSR = (1<<WDIE);             // Enable interrupt every 16ms
-    #elif defined(AVRXMEGA3)  // ATTINY816, 817, etc
-        RTC.PITINTCTRL = RTC_PI_bm;   // enable the Periodic Interrupt
-        while (RTC.PITSTATUS > 0) {}  // make sure the register is ready to be updated
-        RTC.PITCTRLA = RTC_PERIOD_CYC512_gc | RTC_PITEN_bm; // Period = 16ms, enable the PI Timer
-    #else
-        #error Unrecognized MCU type
-    #endif
-}
-
-#ifdef TICK_DURING_STANDBY
-inline void WDT_slow()
-{
-    #if (ATTINY == 25) || (ATTINY == 45) || (ATTINY == 85)
-        // interrupt slower
-        //cli();                          // Disable interrupts
-        wdt_reset();                    // Reset the WDT
-        WDTCR |= (1<<WDCE) | (1<<WDE);  // Start timed sequence
-        WDTCR = (1<<WDIE) | STANDBY_TICK_SPEED; // Enable interrupt every so often
-        //sei();                          // Enable interrupts
-    #elif (ATTINY == 1634)
-        wdt_reset();                    // Reset the WDT
-        WDTCSR = (1<<WDIE) | STANDBY_TICK_SPEED;
-    #elif defined(AVRXMEGA3)  // ATTINY816, 817, etc
-        RTC.PITINTCTRL = RTC_PI_bm;   // enable the Periodic Interrupt
-        while (RTC.PITSTATUS > 0) {}  // make sure the register is ready to be updated
-        RTC.PITCTRLA = (1<<6) | (STANDBY_TICK_SPEED<<3) | RTC_PITEN_bm; // Set period, enable the PI Timer
-    #else
-        #error Unrecognized MCU type
-    #endif
-}
-#endif
-
-inline void WDT_off()
-{
-    #if (ATTINY == 25) || (ATTINY == 45) || (ATTINY == 85)
-        //cli();                          // Disable interrupts
-        wdt_reset();                    // Reset the WDT
-        MCUSR &= ~(1<<WDRF);            // Clear Watchdog reset flag
-        WDTCR |= (1<<WDCE) | (1<<WDE);  // Start timed sequence
-        WDTCR = 0x00;                   // Disable WDT
-        //sei();                          // Enable interrupts
-    #elif (ATTINY == 1634)
-        cli();                // needed because CCP, below
-        wdt_reset();          // Reset the WDT
-        MCUSR &= ~(1<<WDRF);  // clear watchdog reset flag
-        CCP = 0xD8;           // enable config changes
-        WDTCSR = 0;           // disable and clear all WDT settings
-        sei();
-    #elif defined(AVRXMEGA3)  // ATTINY816, 817, etc
-        while (RTC.PITSTATUS > 0) {}  // make sure the register is ready to be updated
-        RTC.PITCTRLA = 0; // Disable the PI Timer
-    #else
-        #error Unrecognized MCU type
-    #endif
-}
-
 // clock tick -- this runs every 16ms (62.5 fps)
-#ifdef AVRXMEGA3  // ATTINY816, 817, etc
-ISR(RTC_PIT_vect) {
-    RTC.PITINTFLAGS = RTC_PI_bm; // clear the PIT interrupt flag 
-#else
 ISR(WDT_vect) {
-#endif
+    mcu_wdt_vect_clear();
     irq_wdt = 1;  // WDT event happened
 }