Merge pull request #35 from berichan/master

Screen on/off, single-command sequential button presses, sys info requests, token cancels + 12.0.0 support

sys-botbase/source/.vscode/settings.json

@@ -1,5 +1,6 @@
 {
     "files.associations": {
-        "switch.h": "c"
+        "switch.h": "c",
+        "cstring": "c"
     }
 }

sys-botbase/source/commands.c

@@ -189,25 +189,29 @@ void readMem(u8* out, u64 offset, u64 size)
         printf("svcReadDebugProcessMemory: %d\n", rc);
 }
 
-void click(HidControllerKeys btn)
+void click(HidNpadButton btn)
 {
     initController();
     press(btn);
     svcSleepThread(buttonClickSleepTime * 1e+6L);
     release(btn);
 }
-void press(HidControllerKeys btn)
+void press(HidNpadButton btn)
 {
     initController();
     controllerState.buttons |= btn;
-    hiddbgSetHdlsState(controllerHandle, &controllerState);
+    Result rc = hiddbgSetHdlsState(controllerHandle, &controllerState);
+    if (R_FAILED(rc) && debugResultCodes)
+        printf("hiddbgSetHdlsState: %d\n", rc);
 }
 
-void release(HidControllerKeys btn)
+void release(HidNpadButton btn)
 {
     initController();
     controllerState.buttons &= ~btn;
-    hiddbgSetHdlsState(controllerHandle, &controllerState);
+    Result rc = hiddbgSetHdlsState(controllerHandle, &controllerState);
+    if (R_FAILED(rc) && debugResultCodes)
+        printf("hiddbgSetHdlsState: %d\n", rc);
 }
 
 void setStickState(int side, int dxVal, int dyVal)
@@ -261,7 +265,7 @@ u64 followMainPointer(s64* jumps, size_t count)
     return offset;
 }
 
-void touch(HidTouchState* state, u64 sequentialCount, u64 holdTime, bool hold)
+void touch(HidTouchState* state, u64 sequentialCount, u64 holdTime, bool hold, u8* token)
 {
     initController();
     state->delta_time = holdTime; // only the first touch needs this for whatever reason
@@ -274,6 +278,9 @@ void touch(HidTouchState* state, u64 sequentialCount, u64 holdTime, bool hold)
             hiddbgSetTouchScreenAutoPilotState(NULL, 0);
             svcSleepThread(pollRate * 1e+6L);
         }
+
+        if ((*token) == 1)
+            break;
     }
 
     if(hold) // send finger release event
@@ -314,3 +321,80 @@ void key(HiddbgKeyboardAutoPilotState* states, u64 sequentialCount)
 
     hiddbgUnsetKeyboardAutoPilotState();
 }
+
+void clickSequence(char* seq, u8* token)
+{
+    const char delim = ','; // used for chars and sticks
+    const char startWait = 'W';
+    const char startPress = '+';
+    const char startRelease = '-';
+    const char startLStick = '%';
+    const char startRStick = '&';
+    char* command = strtok(seq, &delim);
+    HidNpadButton currKey = {0};
+    u64 currentWait = 0;
+
+    initController();
+    while (command != NULL)
+    {
+        if ((*token) == 1)
+            break;
+
+        if (!strncmp(command, &startLStick, 1))
+        {
+            // l stick
+            s64 x = parseStringToSignedLong(&command[1]);
+            if(x > JOYSTICK_MAX) x = JOYSTICK_MAX; 
+            if(x < JOYSTICK_MIN) x = JOYSTICK_MIN; 
+            s64 y = 0;
+            command = strtok(NULL, &delim);
+            if (command != NULL)
+                y = parseStringToSignedLong(command);
+            if(y > JOYSTICK_MAX) y = JOYSTICK_MAX;
+            if(y < JOYSTICK_MIN) y = JOYSTICK_MIN;
+            setStickState(JOYSTICK_LEFT, (s32)x, (s32)y);
+        }
+        else if (!strncmp(command, &startRStick, 1))
+        {
+            // r stick
+            s64 x = parseStringToSignedLong(&command[1]);
+            if(x > JOYSTICK_MAX) x = JOYSTICK_MAX; 
+            if(x < JOYSTICK_MIN) x = JOYSTICK_MIN; 
+            s64 y = 0;
+            command = strtok(NULL, &delim);
+            if (command != NULL)
+                y = parseStringToSignedLong(command);
+            if(y > JOYSTICK_MAX) y = JOYSTICK_MAX;
+            if(y < JOYSTICK_MIN) y = JOYSTICK_MIN;
+            setStickState(JOYSTICK_RIGHT, (s32)x, (s32)y);
+        }
+        else if (!strncmp(command, &startPress, 1))
+        {
+            // press
+            currKey = parseStringToButton(&command[1]);
+            press(currKey);
+        }  
+        else if (!strncmp(command, &startRelease, 1))
+        {
+            // release
+            currKey = parseStringToButton(&command[1]);
+            press(currKey);
+        }   
+        else if (!strncmp(command, &startWait, 1))
+        {
+            // wait
+            currentWait = parseStringToInt(&command[1]);
+            svcSleepThread(currentWait * 1e+6l);
+        }
+        else
+        {
+            // click
+            currKey = parseStringToButton(command);
+            press(currKey);
+            svcSleepThread(buttonClickSleepTime * 1e+6L);
+            release(currKey);
+        }
+
+        command = strtok(NULL, &delim);
+    }
+}

sys-botbase/source/commands.h

@@ -32,6 +32,9 @@ typedef struct {
     u8 state;
 } KeyData;
 
+#define JOYSTICK_LEFT 0
+#define JOYSTICK_RIGHT 1
+
 void attach();
 void detach();
 u64 getMainNsoBase(u64 pid);
@@ -44,11 +47,12 @@ void poke(u64 offset, u64 size, u8* val);
 void writeMem(u64 offset, u64 size, u8* val);
 void peek(u64 offset, u64 size);
 void readMem(u8* out, u64 offset, u64 size);
-void click(HidControllerKeys btn);
-void press(HidControllerKeys btn);
-void release(HidControllerKeys btn);
+void click(HidNpadButton btn);
+void press(HidNpadButton btn);
+void release(HidNpadButton btn);
 void setStickState(int side, int dxVal, int dyVal);
 void reverseArray(u8* arr, int start, int end);
 u64 followMainPointer(s64* jumps, size_t count);
-void touch(HidTouchState* state, u64 sequentialCount, u64 holdTime, bool hold);
-void key(HiddbgKeyboardAutoPilotState* states, u64 sequentialCount);
+void touch(HidTouchState* state, u64 sequentialCount, u64 holdTime, bool hold, u8* token);
+void key(HiddbgKeyboardAutoPilotState* states, u64 sequentialCount);
+void clickSequence(char* seq, u8* token);