From 3d12b7066d27b591e0283e20ed066bc66e29fbe4 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Fri, 10 Nov 2023 21:34:40 -0700
Subject: refactor checkpoint: splitting MCU-specific code into arch/$MCU.[ch]

Phew, that's a lot of changes!  And there's still a lot more to do...
---
 fsm/misc.c | 22 ----------------------
 1 file changed, 22 deletions(-)

(limited to 'fsm/misc.c')

diff --git a/fsm/misc.c b/fsm/misc.c
index bc10ea1..5d58f52 100644
--- a/fsm/misc.c
+++ b/fsm/misc.c
@@ -288,25 +288,3 @@ uint8_t triangle_wave(uint8_t phase) {
 }
 #endif
 
-#ifdef USE_REBOOT
-void reboot() {
-    // put the WDT in hard reset mode, then trigger it
-    cli();
-    #if (ATTINY == 25) || (ATTINY == 45) || (ATTINY == 85)
-        WDTCR = 0xD8 | WDTO_15MS;
-    #elif (ATTINY == 1634)
-        // allow protected configuration changes for next 4 clock cycles
-        CCP = 0xD8;  // magic number
-        // reset (WDIF + WDE), no WDIE, fastest (16ms) timing (0000)
-        // (DS section 8.5.2 and table 8-4)
-        WDTCSR = 0b10001000;
-    #elif defined(AVRXMEGA3)  // ATTINY816, 817, etc
-        CCP = CCP_IOREG_gc;  // temporarily disable change protection
-        WDT.CTRLA = WDT_PERIOD_8CLK_gc;  // Enable, timeout 8ms
-    #endif
-    sei();
-    wdt_reset();
-    while (1) {}
-}
-#endif
-
-- 
cgit v1.2.3


From 66b15ad887c2ae74bc7019c006549ac451557a6d Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 19 Nov 2023 01:46:34 -0700
Subject: temporary fix for aux LEDs on avrdd; needs proper refactoring

---
 fsm/misc.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'fsm/misc.c')

diff --git a/fsm/misc.c b/fsm/misc.c
index 5d58f52..fa8ddd7 100644
--- a/fsm/misc.c
+++ b/fsm/misc.c
@@ -118,7 +118,8 @@ uint8_t blink_num(uint8_t num) {
 #ifdef USE_INDICATOR_LED
 void indicator_led(uint8_t lvl) {
     switch (lvl) {
-        #ifdef AVRXMEGA3  // ATTINY816, 817, etc
+        // FIXME: move this logic to arch/*
+        #if (MCU==0x1616) || (MCU==0x32dd20)  // ATTINY816, 817, etc
 
         case 0:  // indicator off
             AUXLED_PORT.DIRSET = (1 << AUXLED_PIN); // set as output
@@ -192,7 +193,8 @@ void indicator_led_auto() {
 void button_led_set(uint8_t lvl) {
     switch (lvl) {
 
-        #ifdef AVRXMEGA3  // ATTINY816, 817, etc
+        // FIXME: move this logic to arch/*
+        #if (MCU==0x1616) || (MCU==0x32dd20)  // ATTINY816, 817, etc
 
         case 0:  // LED off
             BUTTON_LED_PORT.DIRSET = (1 << BUTTON_LED_PIN); // set as output
@@ -240,7 +242,8 @@ void rgb_led_set(uint8_t value) {
         uint8_t pin = pins[i];
         switch (lvl) {
 
-            #ifdef AVRXMEGA3  // ATTINY816, 817, etc
+            // FIXME: move this logic to arch/*
+            #if (MCU==0x1616) || (MCU==0x32dd20)  // ATTINY816, 817, etc
 
             case 0:  // LED off
                 AUXLED_RGB_PORT.DIRSET = (1 << pin); // set as output
-- 
cgit v1.2.3