From 6d9ceae8eab62ba33011a82c8fad8e55d37fe7ba Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 26 Aug 2017 16:48:25 -0600
Subject: Added eeprom load/save API (no wear levelling yet), verified it works
 in DarkHorse.

---
 spaghetti-monster/fsm-eeprom.c | 71 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 spaghetti-monster/fsm-eeprom.c

(limited to 'spaghetti-monster/fsm-eeprom.c')

diff --git a/spaghetti-monster/fsm-eeprom.c b/spaghetti-monster/fsm-eeprom.c
new file mode 100644
index 0000000..5451baf
--- /dev/null
+++ b/spaghetti-monster/fsm-eeprom.c
@@ -0,0 +1,71 @@
+/*
+ * fsm-eeprom.c: EEPROM API for SpaghettiMonster.
+ *
+ * Copyright (C) 2017 Selene ToyKeeper
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef FSM_EEPROM_C
+#define FSM_EEPROM_C
+
+#include "fsm-eeprom.h"
+
+#if EEPROM_BYTES > 0
+#if EEPROM_BYTES >= (EEPSIZE/2)
+#error Requested EEPROM_BYTES too big.
+#endif
+uint8_t eeprom[EEPROM_BYTES];
+
+uint8_t load_eeprom() {
+    cli();
+    // check if eeprom has been initialized; abort if it hasn't
+    uint8_t marker = eeprom_read_byte((uint8_t *)EEP_START);
+    if (marker != EEP_MARKER) { sei(); return 0; }
+
+    // load the actual data
+    for(uint8_t i=0; i<EEPROM_BYTES; i++) {
+        eeprom[i] = eeprom_read_byte((uint8_t *)(EEP_START+1+i));
+    }
+    sei();
+    return 1;
+}
+
+void save_eeprom() {
+    cli();
+    eeprom_update_byte((uint8_t *)EEP_START, EEP_MARKER);
+
+    // save the actual data
+    for(uint8_t i=0; i<EEPROM_BYTES; i++) {
+        eeprom_update_byte((uint8_t *)(EEP_START+1+i), eeprom[i]);
+    }
+    sei();
+}
+#endif
+
+#if EEPROM_WL_BYTES > 0
+#if EEPROM_WL_BYTES >= (EEPSIZE/4)
+#error Requested EEPROM_WL_BYTES too big.
+#endif
+uint8_t eeprom_wl[EEPROM_WL_BYTES];
+
+uint8_t load_wl_eeprom() {
+}
+
+void save_wl_eeprom() {
+}
+#endif
+
+
+#endif
-- 
cgit v1.2.3


From 2370e0a3ce0a3ab928ac19af074a3ef67d533ca6 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 26 Aug 2017 17:12:31 -0600
Subject: Made wear-levelling work.  Takes a bunch of extra ROM though. Also,
 I've only tested it a tiny amount.

---
 spaghetti-monster/fsm-eeprom.c | 48 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 42 insertions(+), 6 deletions(-)

(limited to 'spaghetti-monster/fsm-eeprom.c')

diff --git a/spaghetti-monster/fsm-eeprom.c b/spaghetti-monster/fsm-eeprom.c
index 5451baf..e464785 100644
--- a/spaghetti-monster/fsm-eeprom.c
+++ b/spaghetti-monster/fsm-eeprom.c
@@ -23,9 +23,6 @@
 #include "fsm-eeprom.h"
 
 #if EEPROM_BYTES > 0
-#if EEPROM_BYTES >= (EEPSIZE/2)
-#error Requested EEPROM_BYTES too big.
-#endif
 uint8_t eeprom[EEPROM_BYTES];
 
 uint8_t load_eeprom() {
@@ -55,15 +52,54 @@ void save_eeprom() {
 #endif
 
 #if EEPROM_WL_BYTES > 0
-#if EEPROM_WL_BYTES >= (EEPSIZE/4)
-#error Requested EEPROM_WL_BYTES too big.
-#endif
 uint8_t eeprom_wl[EEPROM_WL_BYTES];
+EEP_OFFSET_T eep_wl_prev_offset;
 
 uint8_t load_wl_eeprom() {
+    cli();
+    // check if eeprom has been initialized; abort if it hasn't
+    uint8_t found = 0;
+    EEP_OFFSET_T offset;
+    for(offset = 0;
+        offset < EEP_WL_SIZE - EEPROM_WL_BYTES - 1;
+        offset += (EEPROM_WL_BYTES + 1)) {
+        if (eeprom_read_byte((uint8_t *)offset) == EEP_MARKER) {
+            found = 1;
+            eep_wl_prev_offset = offset;
+            break;
+        }
+    }
+
+    if (found) {
+        // load the actual data
+        for(uint8_t i=0; i<EEPROM_WL_BYTES; i++) {
+            eeprom_wl[i] = eeprom_read_byte((uint8_t *)(offset+1+i));
+        }
+    }
+    sei();
+    return found;
 }
 
 void save_wl_eeprom() {
+    cli();
+    // erase old state
+    EEP_OFFSET_T offset = eep_wl_prev_offset;
+    for (uint8_t i = 0; i < EEPROM_WL_BYTES+1; i ++) {
+        eeprom_update_byte((uint8_t *)offset+i, 0xFF);
+    }
+
+    // save new state
+    offset += EEPROM_WL_BYTES+1;
+    if (offset > EEP_WL_SIZE-EEPROM_WL_BYTES-1) offset = 0;
+    eep_wl_prev_offset = offset;
+    // marker byte
+    eeprom_update_byte((uint8_t *)offset, EEP_MARKER);
+    offset ++;
+    // user data
+    for(uint8_t i=0; i<EEPROM_WL_BYTES; i++, offset++) {
+        eeprom_update_byte((uint8_t *)(offset), eeprom_wl[i]);
+    }
+    sei();
 }
 #endif
 
-- 
cgit v1.2.3


From 976c5724bf0a3ddbe6d4b385841a0a5bf38f4b25 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Fri, 29 Sep 2017 17:31:10 -0600
Subject: Added option to start at memorized level, for momentary use on
 dual-switch lights. Renamed WL versions of eeprom functions, for naming
 consistency.

---
 spaghetti-monster/fsm-eeprom.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'spaghetti-monster/fsm-eeprom.c')

diff --git a/spaghetti-monster/fsm-eeprom.c b/spaghetti-monster/fsm-eeprom.c
index e464785..45cd3fa 100644
--- a/spaghetti-monster/fsm-eeprom.c
+++ b/spaghetti-monster/fsm-eeprom.c
@@ -55,7 +55,7 @@ void save_eeprom() {
 uint8_t eeprom_wl[EEPROM_WL_BYTES];
 EEP_OFFSET_T eep_wl_prev_offset;
 
-uint8_t load_wl_eeprom() {
+uint8_t load_eeprom_wl() {
     cli();
     // check if eeprom has been initialized; abort if it hasn't
     uint8_t found = 0;
@@ -80,7 +80,7 @@ uint8_t load_wl_eeprom() {
     return found;
 }
 
-void save_wl_eeprom() {
+void save_eeprom_wl() {
     cli();
     // erase old state
     EEP_OFFSET_T offset = eep_wl_prev_offset;
-- 
cgit v1.2.3


From 9ae4f570a4b56fb3eb60f4c244931c771415944b Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Mon, 6 Nov 2017 08:51:57 -0700
Subject: Made FSM eeprom more atomic by writing marker byte last.

---
 spaghetti-monster/fsm-eeprom.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'spaghetti-monster/fsm-eeprom.c')

diff --git a/spaghetti-monster/fsm-eeprom.c b/spaghetti-monster/fsm-eeprom.c
index 45cd3fa..012e088 100644
--- a/spaghetti-monster/fsm-eeprom.c
+++ b/spaghetti-monster/fsm-eeprom.c
@@ -41,12 +41,14 @@ uint8_t load_eeprom() {
 
 void save_eeprom() {
     cli();
-    eeprom_update_byte((uint8_t *)EEP_START, EEP_MARKER);
 
     // save the actual data
     for(uint8_t i=0; i<EEPROM_BYTES; i++) {
         eeprom_update_byte((uint8_t *)(EEP_START+1+i), eeprom[i]);
     }
+
+    // save the marker last, to indicate the transaction is complete
+    eeprom_update_byte((uint8_t *)EEP_START, EEP_MARKER);
     sei();
 }
 #endif
@@ -93,6 +95,7 @@ void save_eeprom_wl() {
     if (offset > EEP_WL_SIZE-EEPROM_WL_BYTES-1) offset = 0;
     eep_wl_prev_offset = offset;
     // marker byte
+    // FIXME: write the marker last, to signal completed transaction
     eeprom_update_byte((uint8_t *)offset, EEP_MARKER);
     offset ++;
     // user data
-- 
cgit v1.2.3


From 9fbfa14e63a6b7f8e495ca4cf1f7b82c2e638215 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 3 Dec 2017 17:22:01 -0700
Subject: Made it possible to override address of eeprom array in RAM. (useful
 when trying to use a single large data structure without wasting twice its
 size in RAM)

---
 spaghetti-monster/fsm-eeprom.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'spaghetti-monster/fsm-eeprom.c')

diff --git a/spaghetti-monster/fsm-eeprom.c b/spaghetti-monster/fsm-eeprom.c
index 012e088..bb63c7e 100644
--- a/spaghetti-monster/fsm-eeprom.c
+++ b/spaghetti-monster/fsm-eeprom.c
@@ -23,7 +23,11 @@
 #include "fsm-eeprom.h"
 
 #if EEPROM_BYTES > 0
+#ifdef EEPROM_OVERRIDE
+uint8_t *eeprom;
+#else
 uint8_t eeprom[EEPROM_BYTES];
+#endif
 
 uint8_t load_eeprom() {
     cli();
-- 
cgit v1.2.3