From 99cb397be50ce5762a777483f3bc1d835b33317f Mon Sep 17 00:00:00 2001
From: BZL <sakeruchizu1459@gmail.com>
Date: Tue, 22 Nov 2022 02:14:05 +0900
Subject: [PATCH] Add files via upload
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

NX2 ver 2.00 - 2.07の対応
---
 CH55xSwitchSerialControl.ino | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/CH55xSwitchSerialControl.ino b/CH55xSwitchSerialControl.ino
index b12cb51..a4ef817 100644
--- a/CH55xSwitchSerialControl.ino
+++ b/CH55xSwitchSerialControl.ino
@@ -119,6 +119,22 @@ void parseLine(char* line) {
     } else if (strncmp(&line[3], "CENTER", 6) == 0) {
       pc_report.RY = STICK_NEUTRAL;
     }
+  } else if (line[0] == 0xaa) {
+    // nx2
+    pc_report.Button = line[5] | (line[6] << 8);
+    pc_report.Hat = line[7];
+    pc_report.LX = STICK_NEUTRAL;
+    pc_report.LY = STICK_NEUTRAL;
+    pc_report.RX = STICK_NEUTRAL;
+    pc_report.RY = STICK_NEUTRAL;
+    if (line[8] & 1) pc_report.LX = STICK_MIN;
+    if (line[8] & 2) pc_report.LX = STICK_MAX;
+    if (line[8] & 4) pc_report.LY = STICK_MIN;
+    if (line[8] & 8) pc_report.LY = STICK_MAX;
+    if (line[9] & 1) pc_report.RX = STICK_MIN;
+    if (line[9] & 2) pc_report.RX = STICK_MAX;
+    if (line[9] & 4) pc_report.RY = STICK_MIN;
+    if (line[9] & 8) pc_report.RY = STICK_MAX;
   } else if (line[0] >= '0' && line[0] <= '9') {
     // pokecon or nx2 ver2.08
     __xdata uint8_t char_pos = 0;
@@ -235,14 +251,20 @@ void setup() {
   resetDirections();
 }
 
+__xdata bool isNx2 = false;
+
 void loop() {
   while (Serial0_available()) {
     char c = Serial0_read();
 
-    if ((c != '\n') && idx < MAX_BUFFER)
+    if (c == 0xaa) {
+      isNx2 = true;
+    }
+
+    if ((c != '\n' || isNx2) && idx < MAX_BUFFER)
       pc_report_str[idx++] = c;
 
-    if (c == '\r') {
+    if (c == '\r' || (isNx2 && idx == 11)) {
       idx = 0;
       parseLine(pc_report_str);
       sendReport((uint8_t*)&pc_report);