final changes, we are ready to test with SM-2201

MossbauerLab · Mar 4, 2020 · 730841f · 730841f
1 parent 9d675e8
commit 730841f
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 23 deletions.
diff --git a/MossbauerLab.Sm2201.ExtSaveUtility/src/saveManager/autoSaveManager.cpp b/MossbauerLab.Sm2201.ExtSaveUtility/src/saveManager/autoSaveManager.cpp
@@ -223,9 +223,8 @@ void MossbauerLab::Sm2201::SaveManager::AutoSaveManager::reloadConfig()
     _config->reload();
 }
 
-void MossbauerLab::Sm2201::SaveManager::AutoSaveManager::sendKeysSequence(HWND window, int channel, int technology)
+void MossbauerLab::Sm2201::SaveManager::AutoSaveManager::activateWindow(HWND window)
 {
-    // 0. make window active
     /*INPUT keyBoardInput;
     keyBoardInput.type = INPUT_KEYBOARD;
     keyBoardInput.ki.wScan = 0;
@@ -240,25 +239,33 @@ void MossbauerLab::Sm2201::SaveManager::AutoSaveManager::sendKeysSequence(HWND w
     keyBoardInput.ki.dwFlags = 2;   // key up
     SendInput(1, &keyBoardInput, sizeof(INPUT));*/
 
-    std::vector<DWORD> charCodes;
-    if (channel == 1)
-        charCodes.push_back(VK_LEFT);
-    else charCodes.push_back(VK_RIGHT);
-    charCodes.push_back(0x43);      // continue
-    charCodes.push_back(VK_RETURN); // scaling coeff
-    charCodes.push_back(VK_RETURN); // stop update
-    charCodes.push_back(0x57);      // write
-    charCodes.push_back(VK_RETURN); // submit name
-    charCodes.push_back(VK_RETURN); // submit overwrite
+    SendMessage(window, WM_ACTIVATE, WA_CLICKACTIVE, 0);
+}
+
+void MossbauerLab::Sm2201::SaveManager::AutoSaveManager::sendKeysSequence(HWND window, int channel, int technology)
+{
+    // 0. make window active
+    activateWindow(window);
+
+    if (technology == WINDOWS_MSG || technology == SEND_INPUT) //sending via Windows MSG
+    {  
+        std::vector<DWORD> charCodes;
+        if (channel == 1)
+            charCodes.push_back(VK_LEFT);
+        else charCodes.push_back(VK_RIGHT);
+        charCodes.push_back(0x43);      // continue
+        charCodes.push_back(VK_RETURN); // scaling coeff
+        charCodes.push_back(VK_RETURN); // stop update
+        charCodes.push_back(0x57);      // write
+        charCodes.push_back(VK_RETURN); // submit name
+        charCodes.push_back(VK_RETURN); // submit overwrite
+
+        if(technology == WINDOWS_MSG)
+            sendKeysViaWindowMsg(window, charCodes);
+        else
+            sendKeysViaInput(charCodes);
+    } 
 
-    if (technology == WINDOWS_MSG) //sending via Windows MSG
-    {        
-        sendKeysViaWindowMsg(window, charCodes);
-    }
-    else if (technology == SEND_INPUT)
-    {
-        sendKeysViaInput(charCodes);
-    }
     else if (technology == DIRECT_PORT_WRITE)
     {
         std::vector<BYTE> scanCodes;
@@ -376,13 +383,13 @@ void MossbauerLab::Sm2201::SaveManager::AutoSaveManager::sendKeysViaPortVxdDrive
         _vxdAccessor->write(KEYBOARD_CMD_REG, 0xD2, 1);
         _vxdAccessor->write(KEYBOARD_DATA_REG, (*it), 1);
         result = _vxdAccessor->read(KEYBOARD_DATA_REG, 1);
-        std::cout <<"Keyboard command result for KEY DOWN: "<< result << std::endl;
+        //std::cout <<"Keyboard command result for KEY DOWN: "<< result << std::endl;
         // send scan code for key up
         BYTE keyUpCode = (*it) | 128;
         Sleep(keyPause);
         _vxdAccessor->write(KEYBOARD_CMD_REG, 0xD2, 1);
         _vxdAccessor->write(KEYBOARD_DATA_REG, keyUpCode, 1);
         result = _vxdAccessor->read(KEYBOARD_DATA_REG, 1);
-        std::cout <<"Keyboard command result for KEY UP: "<< result << std::endl;
+        //std::cout <<"Keyboard command result for KEY UP: "<< result << std::endl;
     }
 }
diff --git a/MossbauerLab.Sm2201.ExtSaveUtility/src/saveManager/autoSaveManager.h b/MossbauerLab.Sm2201.ExtSaveUtility/src/saveManager/autoSaveManager.h
@@ -29,6 +29,7 @@ namespace MossbauerLab
                 void reloadConfig();
                 void sendKeysSequence(HWND window, int channel, int technology = 0);
             private:
+                void activateWindow(HWND window);
                 void sendKeysViaWindowMsg(HWND window, const std::vector<DWORD>& keys, int keyPause = 500);
                 // HERE we send scancodes from group 1
                 void sendKeysViaKeyboardController(const std::vector<BYTE>& scanCodes, int keyPause = 500);

diff --git a/MossbauerLab.Sm2201.ExtSaveUtility/src/utils/windows/vxdAccessor.cpp b/MossbauerLab.Sm2201.ExtSaveUtility/src/utils/windows/vxdAccessor.cpp
@@ -20,7 +20,7 @@ bool MossbauerLab::Utils::Windows::VxDAccessor::init()
 {
     _hVxD = CreateFile(_T("\\\\.\\DIO_W55"), 0, 0, 0, 
                        CREATE_NEW, FILE_FLAG_DELETE_ON_CLOSE, 0);
-    DWORD errCode = GetLastError();
+    // DWORD errCode = GetLastError();
     return _hVxD != INVALID_HANDLE_VALUE;
 }