Code tidyup and added diskflashback "kick"

Author: RobSmithDev

ArduinoFloppyReader/ArduinoFloppyReader/ArduinoFloppyReader.vcxproj

@@ -91,7 +91,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DISKFLASHBACK_KILL;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>false</SDLCheck>
     </ClCompile>
     <Link>
@@ -104,7 +104,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DISKFLASHBACK_KILL;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
     </ClCompile>
     <Link>
@@ -119,7 +119,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DISKFLASHBACK_KILL;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
@@ -137,7 +137,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DISKFLASHBACK_KILL;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
     </ClCompile>
     <Link>

ArduinoFloppyReader/ArduinoFloppyReaderWin/ArduinoFloppyReaderWin.vcxproj

@@ -99,7 +99,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_WINSOCK_DEPRECATED_NO_WARNINGS;USING_MFC;WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions);_WIN32_WINNT=0x0601</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DISKFLASHBACK_KILL;_WINSOCK_DEPRECATED_NO_WARNINGS;USING_MFC;WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions);_WIN32_WINNT=0x0601</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
@@ -123,7 +123,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions);_WIN32_WINNT=0x0601</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DISKFLASHBACK_KILL;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions);_WIN32_WINNT=0x0601</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
@@ -148,7 +148,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_WINSOCK_DEPRECATED_NO_WARNINGS;USING_MFC;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions);_WIN32_WINNT=0x0601</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DISKFLASHBACK_KILL;_WINSOCK_DEPRECATED_NO_WARNINGS;USING_MFC;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions);_WIN32_WINNT=0x0601</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
@@ -176,7 +176,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;NDEBUG;%(PreprocessorDefinitions);_WIN32_WINNT=0x0601</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DISKFLASHBACK_KILL;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;NDEBUG;%(PreprocessorDefinitions);_WIN32_WINNT=0x0601</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>

ArduinoFloppyReader/lib/ArduinoInterface.cpp

@@ -501,6 +501,15 @@ DiagnosticResponse ArduinoInterface::internalOpenPort(const std::wstring& portNa
 	return response;
 }
 
+#ifdef DISKFLASHBACK_KILL
+#ifdef _WIN32
+void releaseVirtualDrives(bool release, int controllerType) {
+	HWND remoteWindow = FindWindow(L"VIRTUALDRIVE_CONTROLLER_CLASS", L"DiskFlashback Tray Control");
+	if (remoteWindow) SendMessage(remoteWindow, WM_USER + 2, (controllerType & 0x7FFF) | (release ? 0 : 0x8000), (LPARAM)GetCurrentProcessId());
+}
+#endif
+#endif
+
 // Attempts to open the reader running on the COM port number provided.  Port MUST support 2M baud
 DiagnosticResponse ArduinoInterface::openPort(const std::wstring& portName, bool enableCTSflowcontrol) {
 	m_lastCommand = LastCommand::lcOpenPort;
@@ -509,6 +518,12 @@ DiagnosticResponse ArduinoInterface::openPort(const std::wstring& portName, bool
 	// Quickly force streaming to be aborted
 	m_abortStreaming = true;
 
+#ifdef DISKFLASHBACK_KILL
+#ifdef _WIN32
+	releaseVirtualDrives(true, 0);
+#endif
+#endif
+
 	std::string versionString;
 	m_lastError = internalOpenPort(portName, enableCTSflowcontrol, true, versionString, m_comPort);
 	if (m_lastError != DiagnosticResponse::drOK) return m_lastError;
@@ -582,6 +597,12 @@ void ArduinoInterface::closePort() {
 	m_isWriteProtected = false;
 	m_diskInDrive = false;
 	m_lastCommand = old;
+#ifdef DISKFLASHBACK_KILL
+#ifdef _WIN32
+	releaseVirtualDrives(false, 0);
+#endif
+#endif
+
 }
 
 // Returns true if the track actually contains some data, else its considered blank or unformatted

FloppyDriveController.sketch/FloppyDriveController.sketch.ino

@@ -1,6 +1,6 @@
 /* DrawBridge a.k.a ArduinoFloppyReader (and writer)
 *
-* Copyright (C) 2017-2022 Robert Smith (@RobSmithDev)
+* Copyright (C) 2017-2024 Robert Smith (@RobSmithDev)
 * https://amiga.robsmithdev.co.uk
 *
 * This sketch is free software; you can redistribute it and/or
@@ -74,8 +74,7 @@
                       Created ASM version for DrawBridge Plus! Classic gets a more accurate version but couldnt get the code stable
               v1.9.24 More Accurate PLL for both DrawBridge Classic and Plus!
               v1.9.25 Added support for tracks 82 and 83
-                      Fixed compiler warnings
-              v1.9.26 Added support to read the state of BOD, just incase the device resets due to motor surges!
+                      Tidied up the code to remove warnings
                       
 */    
 
@@ -219,6 +218,9 @@ bool disktypeHD = 0;
 // Center position reading HD disks in DB classic mode (this is TIMING_OVERHEAD+DB_CLASSIC_HD_MIDDLE) - this was checked to give the best result with jitter
 #define DB_CLASSIC_HD_MIDDLE -2
 
+
+
+
 // 256 byte circular buffer - don't change this, we abuse the unsigned char to overflow back to zero!
 #define SERIAL_BUFFER_SIZE 256
 #define SERIAL_BUFFER_START (SERIAL_BUFFER_SIZE - 16)
@@ -357,29 +359,11 @@ void setup() {
     PCMSK2 = 0;
     PCMSK1 = 0;
     EIMSK&=~B00000011;  // disable INT0/1 interrupt mask
-
-    // see what reset us
-    powerResetDetect();
 
     // Setup the USART
     prepSerialInterface();
 }
 
-// see what reset us - we keep a bitmask of all the reset reasons just incase we externally reset the device and miss one.
-void powerResetDetect() {
-  // Get reset reasons.  We don't care about power on reset
-  unsigned char reason = MCUSR & (bit(WDRF) | bit(BORF) | bit(EXTRF));
-  unsigned char lastReason;
-  EEPROM.get(12, lastReason);
-
-  // New reset state detected
-  if (reason | lastReason != lastReason) EEPROM.set(12, lastReason | reason);
-
-  // Clear reset flags
-  MCUSR |= bit(BORF) | bit(PORF) | bit(EXTRF) | bit(WDRF);
-}
-
-
 // Refresh bools after eeprom has been written to
 void refreshEEPROMSettings() {
     // Has this hardware been updated? - If you can't connect pin12 to GND because you want to use the ISP headers, then see https://amiga.robsmithdev.co.uk/isp
@@ -412,8 +396,6 @@ void refreshEEPROMSettings() {
     EEPROM.get(10, b1);
     EEPROM.get(11, b2);
     alwaysIndexAlignWrites = (((b1 == 0x69) && (b2 == 0x61)));   
-
-    // note EEPROM 12 is reserved for reset detect
 
 }
 
@@ -3385,7 +3367,6 @@ void testDiskDensity() {
     PCMSK2 = bit(PCINT20);
 
     unsigned int overflows = 0;
-
     unsigned int HDPulses = 0;
     unsigned int DDPulses = 0;
     unsigned char counter;
@@ -3543,7 +3524,7 @@ void loop() {
                                   (alwaysIndexAlignWrites ? FLAGS_INDEX_ALIGN_MODE : 0)  
                                   );
                   writeByteToUART(0);  // RFU
-                  writeByteToUART(26);  // build number
+                  writeByteToUART(25);  // build number
                   break;
 
         // Command "." means go back to track 0
@@ -3732,19 +3713,6 @@ void loop() {
 
         case 'E': readEpromValue(); break;
         case 'e': writeEpromValue(); break;
-
-        // Reset reasons
-        case 'B': writeByteToUART('1');
-                  unsigned char lastReason;
-                  EEPROM.get(12, lastReason);
-                  writeByteToUART(lastReason);
-                  break;
-
-        // Clear reset reasons
-        case 'b': writeByteToUART('1');
-                  EEPROM.set(12, 0);
-                  break;
-
 
       // We don't recognise the command!
       default: