Small fixes in cli apps

Makefile

@@ -7,12 +7,11 @@
 
 CFLAGS ?= -Wall -pedantic -std=c11
 
-ifneq ("$(wildcard /Library/Extensions/foohid.kext/Contents/Info.plist)","")
 all: bin/protocol bin/foohid
-else
-all: bin/protocol
-	@echo "Could not find foohid.kext installed in /Library/Extensions!"
-endif
+
+install: all
+	cp bin/protocol ~/bin/protocol
+	cp bin/foohid ~/bin/foohid
 
 bin/protocol: src/serial.o src/protocol.o
 	@mkdir -p bin

src/foohid.c

@@ -25,6 +25,7 @@
 #define CHECKSUMBYTES 2
 #define PAYLOADBYTES (PACKETSIZE - HEADERBYTES - CHECKSUMBYTES)
 #define CHANNELS 6
+#define TESTCHANNEL 2
 #define CHANNELMAXIMUM 1022
 
 #define FOOHID_NAME "it_unbit_foohid"
@@ -139,10 +140,10 @@ static void foohidSend(uint16_t *data) {
         }
     }
 
-    gamepad.leftX = data[0] - 511;
-    gamepad.leftY = data[1] - 511;
-    gamepad.rightX = data[2] - 511;
-    gamepad.rightY = data[3] - 511;
+    gamepad.leftX = data[3] - 511;
+    gamepad.leftY = data[2] - 511;
+    gamepad.rightX = data[0] - 511;
+    gamepad.rightY = data[1] - 511;
     gamepad.aux1 = data[4] - 511;
     gamepad.aux2 = data[5] - 511;
 
@@ -241,7 +242,16 @@ int main(int argc, char* argv[]) {
                         for (int i = 0; i < (CHANNELS + 1); i++) {
                             buff[i] = data[2 * i] << 8;
                             buff[i] |= data[(2 * i) + 1];
-                            buff[i] -= 1000;
+
+                            if (i < CHANNELS) {
+                                buff[i] -= 1000;
+                            }
+                        }
+
+                        // Check Test Channel Value
+                        if (buff[CHANNELS] != buff[TESTCHANNEL]) {
+                            printf("Wrong test channel value: %d != %d\n",
+                                   buff[CHANNELS], buff[TESTCHANNEL]);
                         }
 
                         foohidSend(buff);

src/protocol.c

@@ -22,15 +22,9 @@
 #define CHECKSUMBYTES 2
 #define PAYLOADBYTES (PACKETSIZE - HEADERBYTES - CHECKSUMBYTES)
 #define CHANNELS 6
-
-/*
 #define TESTCHANNEL 2
-#define TESTCHANNELVALUE 2044
-*/
 
 static int running = 1;
-static int firstPrint = 0;
-static int extraLine = 0;
 
 static void signalHandler(int signo) {
     running = 0;
@@ -42,6 +36,8 @@ int main(int argc, char* argv[]) {
         return 1;
     }
 
+    printf("Opening serial port...\n");
+
     int fd = serialOpen(argv[1], BAUDRATE);
     if (fd == -1) {
         return 1;
@@ -90,45 +86,32 @@ int main(int argc, char* argv[]) {
                     }
 
                     if (checksum != ((checksumData[0] << 8) | checksumData[1])) {
-                        printf("Wrong checksum: %d != %d                    \n",
+                        printf("Wrong checksum: %d != %d\n",
                                checksum, ((checksumData[0] << 8) | checksumData[1]));
-                        extraLine++;
-                        if (extraLine > 1) {
-                            extraLine--;
-                            printf("\r\033[1A");
-                        }
                     } else {
                         // Decode channel values
                         uint16_t buff[CHANNELS + 1];
                         for (int i = 0; i < (CHANNELS + 1); i++) {
                             buff[i] = data[2 * i] << 8;
                             buff[i] |= data[(2 * i) + 1];
-                        }
 
-                        /*
-                        // Check Test Channel Value (?)
-                        if (buff[CHANNELS] != (TESTCHANNELVALUE - buff[TESTCHANNEL])) {
-                            printf("Wrong test channel value: %d != %d (%d - %d)\n",
-                                   buff[CHANNELS], TESTCHANNELVALUE - buff[TESTCHANNEL],
-                                   TESTCHANNELVALUE, buff[TESTCHANNEL]);
+                            if (i < CHANNELS) {
+                                buff[i] -= 1000;
+                            }
+                        }
 
-                            printf("Correct would be: %d\n",
-                                   buff[TESTCHANNEL] + buff[CHANNELS]);
+                        // Check Test Channel Value
+                        if (buff[CHANNELS] != buff[TESTCHANNEL]) {
+                            printf("Wrong test channel value: %d != %d\n",
+                                   buff[CHANNELS], buff[TESTCHANNEL]);
                         }
-                        */
-
-                        if (firstPrint == 0) {
-                            firstPrint = 1;
-                        } else {
-                            int num = CHANNELS + extraLine;
-                            extraLine = 0;
-                            for (int i = 0; i < num; i++) {
-                                printf("\r\033[1A");
-                            }
+
+                        for (int i = 0; i < CHANNELS; i++) {
+                            printf("CH%d: %d\n", i + 1, buff[i]);
                         }
 
                         for (int i = 0; i < CHANNELS; i++) {
-                            printf("CH%d: %d                    \n", i + 1, buff[i] - 1000);
+                            printf("\r\033[1A");
                         }
                     }
                 }
@@ -138,6 +121,7 @@ int main(int argc, char* argv[]) {
         usleep(1000);
     }
 
+    printf("Closing serial port...                    \n");
     serialClose(fd);
 
     return 0;