Merge pull request #8 from 1a2m3/1a2m3-patch-20211201

Update 20211202

Author: 1a2m3

firmware/SpdReaderWriter.ino

@@ -16,7 +16,7 @@
 #include <EEPROM.h>
 #include "SpdReaderWriterSettings.h"  // Settings
 
-#define VERSION 20211201 // Version number (YYYYMMDD)
+#define VERSION 20211202 // Version number (YYYYMMDD)
 
 // RSWP RAM support bitmasks
 #define DDR5 (1 << 5) // Offline mode control
@@ -675,9 +675,16 @@ bool getRswp(uint8_t block) {
   byte commands[] = { RPS0, RPS1, RPS2, RPS3 };
   byte cmd = (block > 0 || block <= 3) ? commands[block] : commands[0];
 
-  setHighVoltage(OFF);
+  // Jedec EE1002(A), TSE2002av compliance  
+  if (block == 0 && !ddr4Detect()) {
+    setHighVoltage(ON);
+  }
+
+  bool status = probeDeviceTypeId(cmd);
 
-  return probeDeviceTypeId(cmd);  // true = unprotected; false = protected or rswp not supported
+  resetPins();
+
+  return status; // true = unprotected; false = protected or rswp not supported
 }
 
 // Clears reversible software write protection
@@ -1037,18 +1044,18 @@ bool probeDeviceTypeId(uint8_t deviceSelectCode) {
   return Wire.requestFrom(cmd, (uint8_t)1) > 0; // true when ACK is received after control byte
 }
 
-// DDR4 detection test
+// DDR4 detection test (address)
 bool ddr4Detect(uint8_t address) {
+  return probeBusAddress(address) && ddr4Detect();
+}
 
-  if (!probeBusAddress(address) || !scanBus()) {
-    return false;
-  }
-
+// DDR4 detection test (generic)
+bool ddr4Detect() {
   return ((setPageAddress(0) ^ getPageAddress(true)) !=
           (setPageAddress(1) ^ getPageAddress(true)));
 }
 
-// DDR5 detetion
+// DDR5 detection test
 bool ddr5Detect(uint8_t address) {
 
   if (!probeBusAddress(address) || !scanBus()) {

src/SpdReaderWriterDll/Settings.cs

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