saving, add some structs for easier reading of btn data

fossephate · Nov 2, 2017 · ddf5c7c · ddf5c7c
1 parent bc20997
commit ddf5c7c
Show file tree

Hide file tree

Showing 7 changed files with 140 additions and 111 deletions.
diff --git a/joycon-driver/build/Win32/Release/joycon-driver.exe b/joycon-driver/build/Win32/Release/joycon-driver.exe
diff --git a/joycon-driver/build/Win32/Release/joycon-driver.iobj b/joycon-driver/build/Win32/Release/joycon-driver.iobj
diff --git a/joycon-driver/build/Win32/Release/joycon-driver.ipdb b/joycon-driver/build/Win32/Release/joycon-driver.ipdb
diff --git a/joycon-driver/include/Joycon.hpp b/joycon-driver/include/Joycon.hpp
@@ -21,6 +21,34 @@ class Joycon {
 	uint16_t buttons = 0;
 	uint16_t buttons2 = 0;// for pro controller
 
+
+	struct btn_states {
+		// left:
+		int up = 0;
+		int down = 0;
+		int left = 0;
+		int right = 0;
+		int l = 0;
+		int zl = 0;
+		int minus = 0;
+		int capture = 0;
+
+		// right:
+		int a = 0;
+		int b = 0;
+		int x = 0;
+		int y = 0;
+		int r = 0;
+		int zr = 0;
+		int plus = 0;
+		int home = 0;
+
+		// shared:
+		int sl = 0;
+		int sr = 0;
+		int stick_button = 0;
+	} btns;
+
 	int8_t dstick;
 	uint8_t battery;
 

diff --git a/joycon-driver/include/tools.hpp b/joycon-driver/include/tools.hpp
@@ -4,6 +4,9 @@
 #include <map>
 #include <string>
 
+//if(a == b || a == c)
+// -> if(a == b $ c)
+//#define $or(a, b, c) if(a == b || a == c)
 
 double lowpassFilter(double a, double thresh) {
 	if (abs(a) > thresh) {

diff --git a/joycon-driver/intermediate/Win32/Release/joycon-driver.tlog/joycon-driver.write.1u.tlog b/joycon-driver/intermediate/Win32/Release/joycon-driver.tlog/joycon-driver.write.1u.tlog