Major release (64-bit)

Author: Scott Vincent

instrument-data-link/instrument-data-link.cpp

@@ -973,11 +973,26 @@ void processSwitchBox(int joyNum)
         case 17: simVars.sbMode = 1; break; // Autopilot
         case 18: simVars.sbMode = 2; break; // Radio
         case 19: simVars.sbMode = 3; break; // Instruments
+        case 20: simVars.sbMode = 4; break; // Navigation
     }
 }
 
-void processRequest()
+void processRequest(int bytes)
 {
+    //// For testing only - Leave commented out
+    //if (request.requestedSize == writeDataSize) {
+    //    if (request.writeData.eventId == KEY_SKYTRACK_STATE) {
+    //        printf("Received %d bytes from %s - Write Request eventId: SKYTRACK_STATE\n", bytes, inet_ntoa(senderAddr.sin_addr));
+    //    }
+    //    else {
+    //        printf("Received %d bytes from %s - Write Request eventId: %d\n", bytes, inet_ntoa(senderAddr.sin_addr), request.writeData.eventId);
+    //    }
+    //}
+    //else {
+    //    // To  test you can send from client with this command: echo - e '\x1\x0\x0\x0' | ncat -u 192.168.1.143 52020
+    //    printf("Received %d bytes from %s - Requesting %d bytes\n", bytes, inet_ntoa(senderAddr.sin_addr), request.requestedSize);
+    //}
+
     if (request.requestedSize == writeDataSize) {
          // This is a write
         if (request.writeData.eventId == KEY_ENG_CRANK) {
@@ -1003,7 +1018,7 @@ void processRequest()
 
         //// For testing only - Leave commented out
         //if (request.writeData.eventId == KEY_CABIN_SEATBELTS_ALERT_SWITCH_TOGGLE) {
-        //    request.writeData.eventId = KEY_COM2_VOLUME_SET;
+        //    request.writeData.eventId = EVENT_RESET_DRONE_FOV;
         //    request.writeData.value = 0;
         //    printf("Intercepted event - Changed to: %d = %f\n", request.writeData.eventId, request.writeData.value);
         //}
@@ -1114,6 +1129,10 @@ void processRequest()
             }
             return;
         }
+        else if (request.writeData.eventId == EVENT_RESET_DRONE_FOV) {
+            writeJetbridgeVar(DRONE_CAMERA_FOV, 50);
+            return;
+        }
 
         if (request.writeData.eventId == KEY_TOGGLE_RAMPTRUCK) {
             printf("Ramp truck requested\n");
@@ -1193,7 +1212,7 @@ void processRequest()
     }
     else {
         // Data size mismatch
-        bytes = sendto(sockfd, (char*)&instrumentsDataSize, sizeof(long), 0, (SOCKADDR*)&senderAddr, addrSize);
+        bytes = sendto(sockfd, (char*)&instrumentsDataSize, 4, 0, (SOCKADDR*)&senderAddr, addrSize);
 #ifdef SHOW_NETWORK_USAGE
         networkOut += bytes;
 #endif
@@ -1251,13 +1270,26 @@ void server()
         int sel = select(FD_SETSIZE, &fds, 0, 0, &timeout);
         if (sel > 0) {
             bytes = recvfrom(sockfd, (char*)&request, sizeof(request), 0, (SOCKADDR*)&senderAddr, &addrSize);
+
 #ifdef SHOW_NETWORK_USAGE
             networkIn += bytes;
 #endif
-            if (bytes > 0) {
-                processRequest();
+            if (bytes > 3) {
+                processRequest(bytes);
             }
             else {
+                if (bytes == -1) {
+                    int error = WSAGetLastError();
+                    if (error == 10040) {
+                        printf("Received more than %ld bytes from %s (WSAError = %d)\n", sizeof(request), inet_ntoa(senderAddr.sin_addr), error);
+                    }
+                    else {
+                        printf("Received from %s but WSAError = %d\n", inet_ntoa(senderAddr.sin_addr), error);
+                    }
+                }
+                else {
+                    printf("Received %d bytes from %s - Not a valid request\n", bytes, inet_ntoa(senderAddr.sin_addr));
+                }
                 bytes = SOCKET_ERROR;
             }
         }

instrument-data-link/jetbridge.h

@@ -17,6 +17,8 @@
 
 #include "jetbridge\client.h"
 
+const char DRONE_CAMERA_FOV[] = "A:DRONE CAMERA FOV, percent";
+
 void jetbridgeInit(HANDLE hSimConnect);
 
 void readJetbridgeVar(const char* var);

instrument-data-link/simvarDefs.cpp

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include "simvarDefs.h"
 
-const char* versionString = "v1.7.8";
+const char* versionString = "v2.0.0";
 
 const char* SimVarDefs[][2] = {
     // Vars for Jetbridge (must come first)
@@ -370,6 +370,7 @@ WriteEvent WriteEvents[] = {
     { EVENT_GO_AROUND, "EVENT_GO_AROUND" },
     { EVENT_IS_CESSNA_152, "EVENT_IS_CESSNA_152" },
     { EVENT_NOT_CESSNA_152, "EVENT_NOT_CESSNA_152" },
+    { EVENT_RESET_DRONE_FOV, "EVENT_RESET_DRONE_FOV" },
     { SWITCHBOX_JOY, "SWITCHBOX_JOY" },
     { VJOY_BUTTONS, "VJOY_BUTTONS" },
     { VJOY_BUTTON_1, "VJOY_BUTTON_1" },

instrument-data-link/simvarDefs.h

@@ -228,7 +228,7 @@ enum EVENT_ID {
     KEY_TOGGLE_FLIGHT_DIRECTOR,
     KEY_AP_SPD_VAR_SET,
     KEY_AP_MACH_VAR_SET,
-    KEY_HEADING_BUG_SET,
+    KEY_HEADING_BUG_SET,            // 50
     KEY_AP_ALT_VAR_SET_ENGLISH,
     KEY_AP_VS_VAR_SET_ENGLISH,
     KEY_AP_AIRSPEED_ON,
@@ -276,7 +276,7 @@ enum EVENT_ID {
     KEY_TANK_SELECT_1,
     KEY_TANK_SELECT_2,
     KEY_ENG_CRANK,
-    KEY_SKYTRACK_STATE,
+    KEY_SKYTRACK_STATE,             // 98
     KEY_G1000_PFD_SOFTKEY_1,
     KEY_G1000_PFD_SOFTKEY_2,
     KEY_G1000_PFD_SOFTKEY_3,
@@ -365,6 +365,7 @@ enum EVENT_ID {
     EVENT_GO_AROUND,
     EVENT_IS_CESSNA_152,
     EVENT_NOT_CESSNA_152,
+    EVENT_RESET_DRONE_FOV,
     SWITCHBOX_JOY,
     VJOY_BUTTONS,
     // Buttons must start from 1 and must be sequential until VJOY_BUTTONS_END
@@ -404,18 +405,18 @@ struct PosData {
 };
 
 struct Request {
-    long requestedSize;
-    long wantFullData;
+    int requestedSize;
+    int wantFullData;
     WriteData writeData;
 };
 
 struct DeltaDouble {
-    long offset;
+    int offset;
     double data;
 };
 
 struct DeltaString {
-    long offset;
+    int offset;
     char data[32];
 };