V1.8.50 - Updates

ClutchplateDude · ClutchplateDude · commit cea76697adbf · 2020-11-07T14:38:55.000-08:00
- Really fixed the EEPROM bug this time. No, really. I promise.
diff --git a/Software/Arduino code/OpenAstroTracker/Version.h b/Software/Arduino code/OpenAstroTracker/Version.h
@@ -1 +1 @@
-#define VERSION "V1.8.49"
+#define VERSION "V1.8.50"
diff --git a/Software/Arduino code/OpenAstroTracker/src/Mount.cpp b/Software/Arduino code/OpenAstroTracker/src/Mount.cpp
@@ -346,20 +346,20 @@ void Mount::writePersistentData(int which, long val)
   bool writeExtended = false;
 
   // If we're written something before...
-  uint16_t magicMarker = EPROMStore::read(5) * 256 + EPROMStore::read(4);
+  uint16_t magicMarker = (EPROMStore::read(5) << 8) + EPROMStore::read(4);
   LOGV3(DEBUG_INFO|DEBUG_EEPROM,F("Mount: EEPROM Write(%d): Marker is %x"), which, magicMarker);
   if ((magicMarker & EEPROM_MAGIC_MASK) == EEPROM_MAGIC_MARKER) {
     // ... read the current state ...
     flag = EPROMStore::read(4);
     if ((magicMarker & EEPROM_MAGIC_EXTENDED_MASK) == EEPROM_MAGIC_EXTENDED_MARKER) {
       extendedFlag = EPROMStore::readInt16(21, 22);
-      LOGV3(DEBUG_INFO|DEBUG_EEPROM,F("Mount: EEPROM Write: Marker is 0xBF, extended flag is %x (%d)"), extendedFlag, extendedFlag);
+      LOGV4(DEBUG_INFO|DEBUG_EEPROM,F("Mount: EEPROM Write: Marker is 0xBF, flag is %x, extended flag is %x (%d)"), flag, extendedFlag, extendedFlag);
     }
     else{
      LOGV3(DEBUG_INFO|DEBUG_EEPROM,F("Mount: EEPROM Write: Marker is 0xBE, flag is %x (%d)"), flag, flag);
     }
   }
-  
+
   switch (which) {
     case EEPROM_RA:
     {

Original file line number	Diff line number	Diff line change
`@@ -346,20 +346,20 @@ void Mount::writePersistentData(int which, long val)`
`346`	`346`	`bool writeExtended = false;`
`347`	`347`
`348`	`348`	`// If we're written something before...`
`349`		`- uint16_t magicMarker = EPROMStore::read(5) * 256 + EPROMStore::read(4);`
	`349`	`+ uint16_t magicMarker = (EPROMStore::read(5) << 8) + EPROMStore::read(4);`
`350`	`350`	`LOGV3(DEBUG_INFO\|DEBUG_EEPROM,F("Mount: EEPROM Write(%d): Marker is %x"), which, magicMarker);`
`351`	`351`	`if ((magicMarker & EEPROM_MAGIC_MASK) == EEPROM_MAGIC_MARKER) {`
`352`	`352`	`// ... read the current state ...`
`353`	`353`	`flag = EPROMStore::read(4);`
`354`	`354`	`if ((magicMarker & EEPROM_MAGIC_EXTENDED_MASK) == EEPROM_MAGIC_EXTENDED_MARKER) {`
`355`	`355`	`extendedFlag = EPROMStore::readInt16(21, 22);`
`356`		`- LOGV3(DEBUG_INFO\|DEBUG_EEPROM,F("Mount: EEPROM Write: Marker is 0xBF, extended flag is %x (%d)"), extendedFlag, extendedFlag);`
	`356`	`+ LOGV4(DEBUG_INFO\|DEBUG_EEPROM,F("Mount: EEPROM Write: Marker is 0xBF, flag is %x, extended flag is %x (%d)"), flag, extendedFlag, extendedFlag);`
`357`	`357`	`}`
`358`	`358`	`else{`
`359`	`359`	`LOGV3(DEBUG_INFO\|DEBUG_EEPROM,F("Mount: EEPROM Write: Marker is 0xBE, flag is %x (%d)"), flag, flag);`
`360`	`360`	`}`
`361`	`361`	`}`
`362`		`-`
	`362`	`+`
`363`	`363`	`switch (which) {`
`364`	`364`	`case EEPROM_RA:`
`365`	`365`	`{`