Fix G1000 managed heading

Author: Scott Vincent

README.md

@@ -7,9 +7,9 @@
 
 Download the following two files.
 
-Link: [Latest release of Radio Panel for Raspberry Pi Zero W](https://github.com/scott-vincent/radio-panel/releases/latest/download/radio-panel-v1.5.4-raspi.tar.gz)
+Link: [Latest release of Radio Panel for Raspberry Pi Zero W](https://github.com/scott-vincent/radio-panel/releases/latest/download/radio-panel-v1.5.5-raspi.tar.gz)
 
-Link: [Latest release of Instrument Data Link for Windows](https://github.com/scott-vincent/instrument-data-link/releases/latest/download/instrument-data-link-v2.0.4-windows-x64.zip)
+Link: [Latest release of Instrument Data Link for Windows](https://github.com/scott-vincent/instrument-data-link/releases/latest/download/instrument-data-link-v2.0.5-windows-x64.zip)
 
 Unzip instrument-data-link into its own folder and double-click instrument-data-link.exe to run it.
 

radio-panel/radio-panel.cpp

@@ -13,7 +13,7 @@
 #include "simvars.h"
 #include "radio.h"
 
-const char* radioVersion = "v1.5.4";
+const char* radioVersion = "v1.5.5";
 const bool Debug = false;
 
 struct globalVars globals;

radio-panel/radio.cpp

@@ -3,6 +3,8 @@
 #include "gpioctrl.h"
 #include "radio.h"
 
+int saveVal;
+
 radio::radio()
 {
     simVars = &globals.simVars->simVars;
@@ -797,6 +799,7 @@ void radio::gpioSquawkInput()
             }
             else {
                 globals.simVars->write(KEY_XPNDR_SET, newVal);
+                printf("New squawk = %d\n", newVal);
             }
             if (switchBox) {
                 prevSquawkValSb = val;
@@ -1260,6 +1263,7 @@ int radio::adjustSquawk(int adjust)
 
     // Convert to BCD
     squawk = digit1 * 4096 + digit2 * 256 + digit3 * 16 + digit4;
+    printf("squawk %d%d%d%d = %d\n", digit1, digit2, digit3, digit4, squawk);
     return squawk;
 }
 

radio-panel/simvarDefs.cpp

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include "simvarDefs.h"
 
-const char* versionString = "v2.0.4";
+const char* versionString = "v2.0.5";
 
 const char* SimVarDefs[][2] = {
     // Vars for Jetbridge (must come first)
@@ -89,6 +89,8 @@ const char* SimVarDefs[][2] = {
     { "Autopilot Altitude Lock Var", "feet" },
     { "Autopilot Altitude Lock Var:3", "feet" },
     { "Autopilot Altitude Lock", "bool" },
+    { "Autopilot Nav1 Lock", "bool" },
+    { "Gps Drives Nav1", "bool" },
     { "Autopilot Pitch Hold", "bool" },
     { "Autopilot Vertical Hold Var", "feet/minute" },
     { "Autopilot Vertical Hold", "bool" },
@@ -137,7 +139,6 @@ const char* SimVarDefs[][2] = {
     { "Nav ToFrom:2", "enum" },
     { "Nav Has Localizer:1", "bool" },
     { "Nav Localizer:1", "degrees" },
-    { "Gps Drives Nav1", "bool" },
     { "Gps Wp Cross Trk", "meters" },
     { "Adf Radial:1", "degrees" },
     { "Adf Card", "degrees" },
@@ -251,6 +252,8 @@ WriteEvent WriteEvents[] = {
     { KEY_AP_LOC_HOLD, "AP_LOC_HOLD" },
     { KEY_AP_APR_HOLD_ON, "AP_APR_HOLD_ON" },
     { KEY_AP_APR_HOLD_OFF, "AP_APR_HOLD_OFF" },
+    { KEY_AP_NAV1_HOLD_ON, "AP_NAV1_HOLD_ON" },
+    { KEY_AP_NAV1_HOLD_OFF, "AP_NAV1_HOLD_OFF" },
     { KEY_AP_PANEL_ALTITUDE_ON, "AP_PANEL_ALTITUDE_ON" },
     { KEY_AUTO_THROTTLE_ARM, "AUTO_THROTTLE_ARM" },
     { KEY_AP_HEADING_SLOT_INDEX_SET, "AP_HEADING_SLOT_INDEX_SET" },

radio-panel/simvarDefs.h

@@ -84,6 +84,8 @@ struct SimVars
     double autopilotAltitude = 0;
     double autopilotAltitude3 = 0;
     double autopilotAltLock = 0;
+    double autopilotNav1Lock = 0;
+    double gpsDrivesNav1 = 0;
     double autopilotPitchHold = 0;
     double autopilotVerticalSpeed = 0;
     double autopilotVerticalHold = 0;
@@ -132,7 +134,6 @@ struct SimVars
     double vor2ToFrom = 0;
     double navHasLocalizer = 0;
     double navLocalizer = 0;
-    double gpsDrivesNav1 = 0;
     double gpsWpCrossTrk = 0;
     double adfRadial = 0;
     double adfCard = 0;
@@ -244,6 +245,8 @@ enum EVENT_ID {
     KEY_AP_LOC_HOLD,
     KEY_AP_APR_HOLD_ON,
     KEY_AP_APR_HOLD_OFF,
+    KEY_AP_NAV1_HOLD_ON,
+    KEY_AP_NAV1_HOLD_OFF,
     KEY_AP_PANEL_ALTITUDE_ON,
     KEY_AUTO_THROTTLE_ARM,
     KEY_AP_HEADING_SLOT_INDEX_SET,

release.sh

@@ -1,4 +1,4 @@
-rel=v1.5.4
+rel=v1.5.5
 mkdir release >/dev/null 2>&1
 rm -rf release/$rel >/dev/null 2>&1
 mkdir release/$rel