Merge pull request #10 from 1a2m3/1a2m3-patch-20211208

20211208 update

Author: 1a2m3

firmware/SpdReaderWriter.ino

@@ -16,7 +16,7 @@
 #include <EEPROM.h>
 #include "SpdReaderWriterSettings.h"  // Settings
 
-#define VERSION 20211206 // Version number (YYYYMMDD)
+#define VERSION 20211208 // Version number (YYYYMMDD)
 
 // RSWP RAM support bitmasks
 #define DDR5 (1 << 5) // Offline mode control
@@ -560,12 +560,11 @@ void cmdPinControl() {
   else if (pin == SA1_SWITCH) {
     // Toggle SA1 state
     if (state == ENABLE || state == DISABLE) {
-      setConfigPin(pins[pin], state);
-      PORT.write(getConfigPin(pins[pin]) == state ? SUCCESS : ERROR);
+      PORT.write(setConfigPin(SA1_EN, state) ? SUCCESS : ERROR);
     }
     // Get SA1 state
     else if (state == GET) {
-      PORT.write(getConfigPin(pins[pin]) == ON ? ON : OFF);
+      PORT.write(getConfigPin(SA1_EN));
     }
     // Unknown state
     else {
@@ -751,9 +750,7 @@ byte rswpSupportTest() {
     rswpSupport |= DDR4;
 
     // RSWP SA1 test
-    if ((setConfigPin(SA1_EN, ON) && setConfigPin(SA1_EN, OFF)) && 
-        (setConfigPin(SA1_EN, ON)  ^ scanBus()) != 
-        (setConfigPin(SA1_EN, OFF) ^ scanBus())) {
+    if ((setConfigPin(SA1_EN, ON) && setConfigPin(SA1_EN, OFF))) {
       rswpSupport |= DDR3;
     }
   }
@@ -1005,22 +1002,21 @@ byte scanBus() {
 // Control config pins
 bool setConfigPin(uint8_t pin, bool state) {
   digitalWrite(pin, state);
-  if (pin == SA1_SWITCH) {
+
+  if (pin == SA1_EN) {
     delay(5);
+    // validate SA1 state against address bitmask when SA1 is high: 82-83, 86-87
+    byte _a1 = 0b11001100;
+    return scanBus() & (state ? _a1 : ~_a1);
   }
 
   return getConfigPin(pin) == state;
 }
 
 // Get config pin state
 bool getConfigPin(uint8_t pin) {
-  // SA1 state check
-  if (pin == SA1_SWITCH) {
-    byte _a1 = 0b11001100; // valid addresses bitmask when SA1 is high: 82-83, 86-87
-    return (digitalRead(pin) ? ((scanBus() & _a1)) : (scanBus() & ~_a1));
-  }
-
-  return digitalRead(pin);
+  byte _a1 = 0b11001100; // addresses bitmask when SA1 is high: 82-83, 86-87
+  return digitalRead(pin) && (pin == SA1_EN ? scanBus() & _a1 : true);
 }
 
 // Reset config pins
@@ -1044,7 +1040,7 @@ bool ddr5SetOfflineMode(bool state) {
 bool ddr5GetOfflineMode() {
 
   // TODO: read MR48:2
-  return false;
+  return getConfigPin(OFF_EN) && false;
 }
 
 // Tests if device address is present on I2C bus

src/SpdReaderWriterDll/Settings.cs

@@ -7,11 +7,11 @@ public class Settings {
         /// <summary>
         /// DLL version
         /// </summary>
-        public const int DLLVERSION  = 20211206;
+        public const int DLLVERSION  = 20211208;
 
         /// <summary>
         /// Minimum device's firmware version required
         /// </summary>
-        public static int MINVERSION = 20211206;
+        public static int MINVERSION = 20211208;
     }
 }