New release

scott-vincent · Aug 12, 2024 · d991365 · d991365
1 parent 24e9cf3
commit d991365
Show file tree

Hide file tree

Showing 7 changed files with 146 additions and 122 deletions.
diff --git a/README.md b/README.md
@@ -7,9 +7,9 @@
 
 Download the following two files.
 
-Link: [Latest release of Power/Lights Panel for Raspberry Pi Zero W](https://github.com/scott-vincent/power-lights-panel/releases/latest/download/power-lights-panel-v1.5.1-raspi.tar.gz)
+Link: [Latest release of Power/Lights Panel for Raspberry Pi Zero W](https://github.com/scott-vincent/power-lights-panel/releases/latest/download/power-lights-panel-v1.5.2-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.1-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.2-windows-x64.zip)
 
 Unzip instrument-data-link into its own folder and double-click instrument-data-link.exe to run it.
 

diff --git a/power-lights-panel/powerLights-panel.cpp b/power-lights-panel/powerLights-panel.cpp
@@ -13,7 +13,7 @@
 #include "simvars.h"
 #include "powerLights.h"
 
-const char* powerLightsVersion = "v1.5.1";
+const char* powerLightsVersion = "v1.5.2";
 const bool Debug = false;
 
 struct globalVars globals;

diff --git a/power-lights-panel/powerLights.cpp b/power-lights-panel/powerLights.cpp
@@ -9,6 +9,8 @@
 // Comment the following line out if you don't want to use vJoy.
 #define vJoyFallback
 
+//#define DEBUG
+
 powerLights::powerLights()
 {
     simVars = &globals.simVars->simVars;
@@ -19,6 +21,22 @@ powerLights::powerLights()
 
 void powerLights::render()
 {
+#ifdef DEBUG
+    bleedTest--;
+    if (bleedTest < 0) {
+        bleedTest = 20;
+    }
+    if (bleedTest == 20) {
+        globals.gpioCtrl->writeLed(apuStartControl, true);
+        globals.gpioCtrl->writeLed(apuBleedControl, true);
+    }
+    else if (bleedTest == 5) {
+        globals.gpioCtrl->writeLed(apuStartControl, false);
+        globals.gpioCtrl->writeLed(apuBleedControl, false);
+    }
+    return;
+#endif
+
     if (!globals.electrics) {
         // Turn off LEDS
         globals.gpioCtrl->writeLed(apuMasterControl, false);

diff --git a/power-lights-panel/powerLights.h b/power-lights-panel/powerLights.h
@@ -9,6 +9,7 @@ class powerLights
     SimVars* simVars;
     Aircraft loadedAircraft = UNDEFINED;
     bool airliner = false;
+    int bleedTest = 0;
 
     bool apuMaster = false;
     bool apuStart = false;

diff --git a/power-lights-panel/simvarDefs.cpp b/power-lights-panel/simvarDefs.cpp
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include "simvarDefs.h"
 
-const char* versionString = "v2.0.1";
+const char* versionString = "v2.0.2";
 
 const char* SimVarDefs[][2] = {
     // Vars for Jetbridge (must come first)
@@ -185,6 +185,7 @@ const char* SimVarDefs[][2] = {
 };
 
 WriteEvent WriteEvents[] = {
+    { SIM_START, "DUMMY" },
     { KEY_CABIN_SEATBELTS_ALERT_SWITCH_TOGGLE, "CABIN_SEATBELTS_ALERT_SWITCH_TOGGLE" },
     { KEY_TRUE_AIRSPEED_CAL_SET, "TRUE_AIRSPEED_CAL_SET" },
     { KEY_KOHLSMAN_SET, "KOHLSMAN_SET" },
@@ -207,18 +208,16 @@ WriteEvent WriteEvents[] = {
     { KEY_COM1_VOLUME_SET, "COM1_VOLUME_SET" },
     { KEY_COM1_TRANSMIT_SELECT, "COM1_TRANSMIT_SELECT" },
     { KEY_COM1_RECEIVE_SELECT, "COM1_RECEIVE_SELECT" },
-    { KEY_COM1_STBY_RADIO_SET, "COM_STBY_RADIO_SET" },
-    { KEY_COM1_RADIO_FRACT_INC, "COM_RADIO_FRACT_INC" },
+    { KEY_COM1_STBY_RADIO_SET_HZ, "COM_STBY_RADIO_SET_HZ" },
     { KEY_COM1_RADIO_SWAP, "COM1_RADIO_SWAP" },
     { KEY_COM2_VOLUME_SET, "COM2_VOLUME_SET" },
     { KEY_COM2_TRANSMIT_SELECT, "COM2_TRANSMIT_SELECT" },
     { KEY_COM2_RECEIVE_SELECT, "COM2_RECEIVE_SELECT" },
-    { KEY_COM2_STBY_RADIO_SET, "COM2_STBY_RADIO_SET" },
-    { KEY_COM2_RADIO_FRACT_INC, "COM2_RADIO_FRACT_INC" },
+    { KEY_COM2_STBY_RADIO_SET_HZ, "COM2_STBY_RADIO_SET_HZ" },
     { KEY_COM2_RADIO_SWAP, "COM2_RADIO_SWAP" },
-    { KEY_NAV1_STBY_SET, "NAV1_STBY_SET" },
+    { KEY_NAV1_STBY_SET_HZ, "NAV1_STBY_SET_HZ" },
     { KEY_NAV1_RADIO_SWAP, "NAV1_RADIO_SWAP" },
-    { KEY_NAV2_STBY_SET, "NAV2_STBY_SET" },
+    { KEY_NAV2_STBY_SET_HZ, "NAV2_STBY_SET_HZ" },
     { KEY_NAV2_RADIO_SWAP, "NAV2_RADIO_SWAP" },
     { KEY_ADF_STBY_SET, "ADF_STBY_SET" },
     { KEY_ADF1_RADIO_SWAP, "ADF1_RADIO_SWAP" },
@@ -235,7 +234,11 @@ WriteEvent WriteEvents[] = {
     { KEY_AP_MACH_VAR_SET, "AP_MACH_VAR_SET" },
     { KEY_HEADING_BUG_SET, "HEADING_BUG_SET" },
     { KEY_AP_ALT_VAR_SET_ENGLISH, "AP_ALT_VAR_SET_ENGLISH" },
+    { KEY_AP_ALT_VAR_INC, "AP_ALT_VAR_INC" },
+    { KEY_AP_ALT_VAR_DEC, "AP_ALT_VAR_DEC" },
     { KEY_AP_VS_VAR_SET_ENGLISH, "AP_VS_VAR_SET_ENGLISH" },
+    { KEY_AP_VS_VAR_INC, "AP_VS_VAR_INC" },
+    { KEY_AP_VS_VAR_DEC, "AP_VS_VAR_DEC" },
     { KEY_AP_AIRSPEED_ON, "AP_AIRSPEED_ON" },
     { KEY_AP_AIRSPEED_OFF, "AP_AIRSPEED_OFF" },
     { KEY_AP_MACH_ON, "AP_MACH_ON" },
@@ -282,57 +285,57 @@ WriteEvent WriteEvents[] = {
     { KEY_TANK_SELECT_2, "TANK_SELECT_2" },
     { KEY_ENG_CRANK, "ENGINE_CRANK" },
     { KEY_SKYTRACK_STATE, "SKYTRACK_STATE" },
-    { KEY_G1000_PFD_SOFTKEY_1, "MobiFlight.AS1000_PFD_SOFTKEYS_1" },
-    { KEY_G1000_PFD_SOFTKEY_2, "MobiFlight.AS1000_PFD_SOFTKEYS_2" },
-    { KEY_G1000_PFD_SOFTKEY_3, "MobiFlight.AS1000_PFD_SOFTKEYS_3" },
-    { KEY_G1000_PFD_SOFTKEY_4, "MobiFlight.AS1000_PFD_SOFTKEYS_4" },
-    { KEY_G1000_PFD_SOFTKEY_5, "MobiFlight.AS1000_PFD_SOFTKEYS_5" },
-    { KEY_G1000_PFD_SOFTKEY_6, "MobiFlight.AS1000_PFD_SOFTKEYS_6" },
-    { KEY_G1000_PFD_SOFTKEY_7, "MobiFlight.AS1000_PFD_SOFTKEYS_7" },
-    { KEY_G1000_PFD_SOFTKEY_8, "MobiFlight.AS1000_PFD_SOFTKEYS_8" },
-    { KEY_G1000_PFD_SOFTKEY_9, "MobiFlight.AS1000_PFD_SOFTKEYS_9" },
-    { KEY_G1000_PFD_SOFTKEY_10, "MobiFlight.AS1000_PFD_SOFTKEYS_10" },
-    { KEY_G1000_PFD_SOFTKEY_11, "MobiFlight.AS1000_PFD_SOFTKEYS_11" },
-    { KEY_G1000_PFD_SOFTKEY_12, "MobiFlight.AS1000_PFD_SOFTKEYS_12" },
-    { KEY_G1000_PFD_DIRECTTO, "MobiFlight.AS1000_PFD_DIRECTTO" },
-    { KEY_G1000_PFD_ENT, "MobiFlight.AS1000_PFD_ENT_Push" },
-    { KEY_G1000_PFD_CLR_LONG, "MobiFlight.AS1000_PFD_CLR_Long" },
-    { KEY_G1000_PFD_CLR, "MobiFlight.AS1000_PFD_CLR" },
-    { KEY_G1000_PFD_MENU, "MobiFlight.AS1000_PFD_MENU_Push" },
-    { KEY_G1000_PFD_FPL, "MobiFlight.AS1000_PFD_FPL_Push" },
-    { KEY_G1000_PFD_PROC, "MobiFlight.AS1000_PFD_PROC_Push" },
-    { KEY_G1000_PFD_UPPER_INC, "MobiFlight.AS1000_PFD_FMS_Upper_INC" },
-    { KEY_G1000_PFD_UPPER_DEC, "MobiFlight.AS1000_PFD_FMS_Upper_DEC" },
-    { KEY_G1000_PFD_PUSH, "MobiFlight.AS1000_PFD_FMS_Upper_PUSH" },
-    { KEY_G1000_PFD_LOWER_INC, "MobiFlight.AS1000_PFD_FMS_Lower_INC" },
-    { KEY_G1000_PFD_LOWER_DEC, "MobiFlight.AS1000_PFD_FMS_Lower_DEC" },
-    { KEY_G1000_MFD_SOFTKEY_1, "MobiFlight.AS1000_MFD_SOFTKEYS_1" },
-    { KEY_G1000_MFD_SOFTKEY_2, "MobiFlight.AS1000_MFD_SOFTKEYS_2" },
-    { KEY_G1000_MFD_SOFTKEY_3, "MobiFlight.AS1000_MFD_SOFTKEYS_3" },
-    { KEY_G1000_MFD_SOFTKEY_4, "MobiFlight.AS1000_MFD_SOFTKEYS_4" },
-    { KEY_G1000_MFD_SOFTKEY_5, "MobiFlight.AS1000_MFD_SOFTKEYS_5" },
-    { KEY_G1000_MFD_SOFTKEY_6, "MobiFlight.AS1000_MFD_SOFTKEYS_6" },
-    { KEY_G1000_MFD_SOFTKEY_7, "MobiFlight.AS1000_MFD_SOFTKEYS_7" },
-    { KEY_G1000_MFD_SOFTKEY_8, "MobiFlight.AS1000_MFD_SOFTKEYS_8" },
-    { KEY_G1000_MFD_SOFTKEY_9, "MobiFlight.AS1000_MFD_SOFTKEYS_9" },
-    { KEY_G1000_MFD_SOFTKEY_10, "MobiFlight.AS1000_MFD_SOFTKEYS_10" },
-    { KEY_G1000_MFD_SOFTKEY_11, "MobiFlight.AS1000_MFD_SOFTKEYS_11" },
-    { KEY_G1000_MFD_SOFTKEY_12, "MobiFlight.AS1000_MFD_SOFTKEYS_12" },
-    { KEY_G1000_MFD_DIRECTTO, "MobiFlight.AS1000_MFD_DIRECTTO" },
-    { KEY_G1000_MFD_ENT, "MobiFlight.AS1000_MFD_ENT_Push" },
-    { KEY_G1000_MFD_CLR_LONG, "MobiFlight.AS1000_MFD_CLR_Long" },
-    { KEY_G1000_MFD_CLR, "MobiFlight.AS1000_MFD_CLR" },
-    { KEY_G1000_MFD_MENU, "MobiFlight.AS1000_MFD_MENU_Push" },
-    { KEY_G1000_MFD_FPL, "MobiFlight.AS1000_MFD_FPL_Push" },
-    { KEY_G1000_MFD_PROC, "MobiFlight.AS1000_MFD_PROC_Push" },
-    { KEY_G1000_MFD_UPPER_INC, "MobiFlight.AS1000_MFD_FMS_Upper_INC" },
-    { KEY_G1000_MFD_UPPER_DEC, "MobiFlight.AS1000_MFD_FMS_Upper_DEC" },
-    { KEY_G1000_MFD_PUSH, "MobiFlight.AS1000_MFD_FMS_Upper_PUSH" },
-    { KEY_G1000_MFD_LOWER_INC, "MobiFlight.AS1000_MFD_FMS_Lower_INC" },
-    { KEY_G1000_MFD_LOWER_DEC, "MobiFlight.AS1000_MFD_FMS_Lower_DEC" },
-    { KEY_G1000_MFD_RANGE_INC, "MobiFlight.AS1000_MFD_RANGE_INC" },
-    { KEY_G1000_MFD_RANGE_DEC, "MobiFlight.AS1000_MFD_RANGE_DEC" },
-    { KEY_G1000_END, "G1000_KEYS_END"},
+    { HVAR_G1000_PFD_SOFTKEY_1, "AS1000_PFD_SOFTKEYS_1" },
+    { HVAR_G1000_PFD_SOFTKEY_2, "AS1000_PFD_SOFTKEYS_2" },
+    { HVAR_G1000_PFD_SOFTKEY_3, "AS1000_PFD_SOFTKEYS_3" },
+    { HVAR_G1000_PFD_SOFTKEY_4, "AS1000_PFD_SOFTKEYS_4" },
+    { HVAR_G1000_PFD_SOFTKEY_5, "AS1000_PFD_SOFTKEYS_5" },
+    { HVAR_G1000_PFD_SOFTKEY_6, "AS1000_PFD_SOFTKEYS_6" },
+    { HVAR_G1000_PFD_SOFTKEY_7, "AS1000_PFD_SOFTKEYS_7" },
+    { HVAR_G1000_PFD_SOFTKEY_8, "AS1000_PFD_SOFTKEYS_8" },
+    { HVAR_G1000_PFD_SOFTKEY_9, "AS1000_PFD_SOFTKEYS_9" },
+    { HVAR_G1000_PFD_SOFTKEY_10, "AS1000_PFD_SOFTKEYS_10" },
+    { HVAR_G1000_PFD_SOFTKEY_11, "AS1000_PFD_SOFTKEYS_11" },
+    { HVAR_G1000_PFD_SOFTKEY_12, "AS1000_PFD_SOFTKEYS_12" },
+    { HVAR_G1000_PFD_DIRECTTO, "AS1000_PFD_DIRECTTO" },
+    { HVAR_G1000_PFD_ENT, "AS1000_PFD_ENT_Push" },
+    { HVAR_G1000_PFD_CLR_LONG, "AS1000_PFD_CLR_Long" },
+    { HVAR_G1000_PFD_CLR, "AS1000_PFD_CLR" },
+    { HVAR_G1000_PFD_MENU, "AS1000_PFD_MENU_Push" },
+    { HVAR_G1000_PFD_FPL, "AS1000_PFD_FPL_Push" },
+    { HVAR_G1000_PFD_PROC, "AS1000_PFD_PROC_Push" },
+    { HVAR_G1000_PFD_UPPER_INC, "AS1000_PFD_FMS_Upper_INC" },
+    { HVAR_G1000_PFD_UPPER_DEC, "AS1000_PFD_FMS_Upper_DEC" },
+    { HVAR_G1000_PFD_PUSH, "AS1000_PFD_FMS_Upper_PUSH" },
+    { HVAR_G1000_PFD_LOWER_INC, "AS1000_PFD_FMS_Lower_INC" },
+    { HVAR_G1000_PFD_LOWER_DEC, "AS1000_PFD_FMS_Lower_DEC" },
+    { HVAR_G1000_MFD_SOFTKEY_1, "AS1000_MFD_SOFTKEYS_1" },
+    { HVAR_G1000_MFD_SOFTKEY_2, "AS1000_MFD_SOFTKEYS_2" },
+    { HVAR_G1000_MFD_SOFTKEY_3, "AS1000_MFD_SOFTKEYS_3" },
+    { HVAR_G1000_MFD_SOFTKEY_4, "AS1000_MFD_SOFTKEYS_4" },
+    { HVAR_G1000_MFD_SOFTKEY_5, "AS1000_MFD_SOFTKEYS_5" },
+    { HVAR_G1000_MFD_SOFTKEY_6, "AS1000_MFD_SOFTKEYS_6" },
+    { HVAR_G1000_MFD_SOFTKEY_7, "AS1000_MFD_SOFTKEYS_7" },
+    { HVAR_G1000_MFD_SOFTKEY_8, "AS1000_MFD_SOFTKEYS_8" },
+    { HVAR_G1000_MFD_SOFTKEY_9, "AS1000_MFD_SOFTKEYS_9" },
+    { HVAR_G1000_MFD_SOFTKEY_10, "AS1000_MFD_SOFTKEYS_10" },
+    { HVAR_G1000_MFD_SOFTKEY_11, "AS1000_MFD_SOFTKEYS_11" },
+    { HVAR_G1000_MFD_SOFTKEY_12, "AS1000_MFD_SOFTKEYS_12" },
+    { HVAR_G1000_MFD_DIRECTTO, "AS1000_MFD_DIRECTTO" },
+    { HVAR_G1000_MFD_ENT, "AS1000_MFD_ENT_Push" },
+    { HVAR_G1000_MFD_CLR_LONG, "AS1000_MFD_CLR_Long" },
+    { HVAR_G1000_MFD_CLR, "AS1000_MFD_CLR" },
+    { HVAR_G1000_MFD_MENU, "AS1000_MFD_MENU_Push" },
+    { HVAR_G1000_MFD_FPL, "AS1000_MFD_FPL_Push" },
+    { HVAR_G1000_MFD_PROC, "AS1000_MFD_PROC_Push" },
+    { HVAR_G1000_MFD_UPPER_INC, "AS1000_MFD_FMS_Upper_INC" },
+    { HVAR_G1000_MFD_UPPER_DEC, "AS1000_MFD_FMS_Upper_DEC" },
+    { HVAR_G1000_MFD_PUSH, "AS1000_MFD_FMS_Upper_PUSH" },
+    { HVAR_G1000_MFD_LOWER_INC, "AS1000_MFD_FMS_Lower_INC" },
+    { HVAR_G1000_MFD_LOWER_DEC, "AS1000_MFD_FMS_Lower_DEC" },
+    { HVAR_G1000_MFD_RANGE_INC, "AS1000_MFD_RANGE_INC" },
+    { HVAR_G1000_MFD_RANGE_DEC, "AS1000_MFD_RANGE_DEC" },
+    { HVAR_G1000_MFD_JOYSTICK_PUSH, "AS1000_MFD_JOYSTICK_PUSH" },
     { A32NX_FCU_SPD_PUSH, "A32NX.FCU_SPD_PUSH" },
     { A32NX_FCU_SPD_PULL, "A32NX.FCU_SPD_PULL" },
     { A32NX_FCU_SPD_SET, "A32NX.FCU_SPD_SET" },

diff --git a/power-lights-panel/simvarDefs.h b/power-lights-panel/simvarDefs.h
@@ -179,7 +179,6 @@ struct SimVars
 
 enum EVENT_ID {
     SIM_START,
-    SIM_STOP,
     KEY_CABIN_SEATBELTS_ALERT_SWITCH_TOGGLE,
     KEY_TRUE_AIRSPEED_CAL_SET,
     KEY_KOHLSMAN_SET,
@@ -202,18 +201,16 @@ enum EVENT_ID {
     KEY_COM1_VOLUME_SET,
     KEY_COM1_TRANSMIT_SELECT,
     KEY_COM1_RECEIVE_SELECT,
-    KEY_COM1_STBY_RADIO_SET,
-    KEY_COM1_RADIO_FRACT_INC,
+    KEY_COM1_STBY_RADIO_SET_HZ,
     KEY_COM1_RADIO_SWAP,
     KEY_COM2_VOLUME_SET,
     KEY_COM2_TRANSMIT_SELECT,
     KEY_COM2_RECEIVE_SELECT,
-    KEY_COM2_STBY_RADIO_SET,
-    KEY_COM2_RADIO_FRACT_INC,
+    KEY_COM2_STBY_RADIO_SET_HZ,
     KEY_COM2_RADIO_SWAP,
-    KEY_NAV1_STBY_SET,
+    KEY_NAV1_STBY_SET_HZ,
     KEY_NAV1_RADIO_SWAP,
-    KEY_NAV2_STBY_SET,
+    KEY_NAV2_STBY_SET_HZ,
     KEY_NAV2_RADIO_SWAP,
     KEY_ADF_STBY_SET,
     KEY_ADF1_RADIO_SWAP,
@@ -228,9 +225,13 @@ enum EVENT_ID {
     KEY_TOGGLE_FLIGHT_DIRECTOR,
     KEY_AP_SPD_VAR_SET,
     KEY_AP_MACH_VAR_SET,
-    KEY_HEADING_BUG_SET,            // 50
+    KEY_HEADING_BUG_SET,
     KEY_AP_ALT_VAR_SET_ENGLISH,
+    KEY_AP_ALT_VAR_INC,
+    KEY_AP_ALT_VAR_DEC,
     KEY_AP_VS_VAR_SET_ENGLISH,
+    KEY_AP_VS_VAR_INC,
+    KEY_AP_VS_VAR_DEC,
     KEY_AP_AIRSPEED_ON,
     KEY_AP_AIRSPEED_OFF,
     KEY_AP_MACH_ON,
@@ -276,58 +277,58 @@ enum EVENT_ID {
     KEY_TANK_SELECT_1,
     KEY_TANK_SELECT_2,
     KEY_ENG_CRANK,
-    KEY_SKYTRACK_STATE,             // 98
-    KEY_G1000_PFD_SOFTKEY_1,
-    KEY_G1000_PFD_SOFTKEY_2,
-    KEY_G1000_PFD_SOFTKEY_3,
-    KEY_G1000_PFD_SOFTKEY_4,
-    KEY_G1000_PFD_SOFTKEY_5,
-    KEY_G1000_PFD_SOFTKEY_6,
-    KEY_G1000_PFD_SOFTKEY_7,
-    KEY_G1000_PFD_SOFTKEY_8,
-    KEY_G1000_PFD_SOFTKEY_9,
-    KEY_G1000_PFD_SOFTKEY_10,
-    KEY_G1000_PFD_SOFTKEY_11,
-    KEY_G1000_PFD_SOFTKEY_12,
-    KEY_G1000_PFD_DIRECTTO,
-    KEY_G1000_PFD_ENT,
-    KEY_G1000_PFD_CLR_LONG,
-    KEY_G1000_PFD_CLR,
-    KEY_G1000_PFD_MENU,
-    KEY_G1000_PFD_FPL,
-    KEY_G1000_PFD_PROC,
-    KEY_G1000_PFD_UPPER_INC,
-    KEY_G1000_PFD_UPPER_DEC,
-    KEY_G1000_PFD_PUSH,
-    KEY_G1000_PFD_LOWER_INC,
-    KEY_G1000_PFD_LOWER_DEC,
-    KEY_G1000_MFD_SOFTKEY_1,
-    KEY_G1000_MFD_SOFTKEY_2,
-    KEY_G1000_MFD_SOFTKEY_3,
-    KEY_G1000_MFD_SOFTKEY_4,
-    KEY_G1000_MFD_SOFTKEY_5,
-    KEY_G1000_MFD_SOFTKEY_6,
-    KEY_G1000_MFD_SOFTKEY_7,
-    KEY_G1000_MFD_SOFTKEY_8,
-    KEY_G1000_MFD_SOFTKEY_9,
-    KEY_G1000_MFD_SOFTKEY_10,
-    KEY_G1000_MFD_SOFTKEY_11,
-    KEY_G1000_MFD_SOFTKEY_12,
-    KEY_G1000_MFD_DIRECTTO,
-    KEY_G1000_MFD_ENT,
-    KEY_G1000_MFD_CLR_LONG,
-    KEY_G1000_MFD_CLR,
-    KEY_G1000_MFD_MENU,
-    KEY_G1000_MFD_FPL,
-    KEY_G1000_MFD_PROC,
-    KEY_G1000_MFD_UPPER_INC,
-    KEY_G1000_MFD_UPPER_DEC,
-    KEY_G1000_MFD_PUSH,
-    KEY_G1000_MFD_LOWER_INC,
-    KEY_G1000_MFD_LOWER_DEC,
-    KEY_G1000_MFD_RANGE_INC,
-    KEY_G1000_MFD_RANGE_DEC,
-    KEY_G1000_END,      // Must be last G1000 key
+    KEY_SKYTRACK_STATE,
+    HVAR_G1000_PFD_SOFTKEY_1,
+    HVAR_G1000_PFD_SOFTKEY_2,
+    HVAR_G1000_PFD_SOFTKEY_3,
+    HVAR_G1000_PFD_SOFTKEY_4,
+    HVAR_G1000_PFD_SOFTKEY_5,
+    HVAR_G1000_PFD_SOFTKEY_6,
+    HVAR_G1000_PFD_SOFTKEY_7,
+    HVAR_G1000_PFD_SOFTKEY_8,
+    HVAR_G1000_PFD_SOFTKEY_9,
+    HVAR_G1000_PFD_SOFTKEY_10,
+    HVAR_G1000_PFD_SOFTKEY_11,
+    HVAR_G1000_PFD_SOFTKEY_12,
+    HVAR_G1000_PFD_DIRECTTO,
+    HVAR_G1000_PFD_ENT,
+    HVAR_G1000_PFD_CLR_LONG,
+    HVAR_G1000_PFD_CLR,
+    HVAR_G1000_PFD_MENU,
+    HVAR_G1000_PFD_FPL,
+    HVAR_G1000_PFD_PROC,
+    HVAR_G1000_PFD_UPPER_INC,
+    HVAR_G1000_PFD_UPPER_DEC,
+    HVAR_G1000_PFD_PUSH,
+    HVAR_G1000_PFD_LOWER_INC,
+    HVAR_G1000_PFD_LOWER_DEC,
+    HVAR_G1000_MFD_SOFTKEY_1,
+    HVAR_G1000_MFD_SOFTKEY_2,
+    HVAR_G1000_MFD_SOFTKEY_3,
+    HVAR_G1000_MFD_SOFTKEY_4,
+    HVAR_G1000_MFD_SOFTKEY_5,
+    HVAR_G1000_MFD_SOFTKEY_6,
+    HVAR_G1000_MFD_SOFTKEY_7,
+    HVAR_G1000_MFD_SOFTKEY_8,
+    HVAR_G1000_MFD_SOFTKEY_9,
+    HVAR_G1000_MFD_SOFTKEY_10,
+    HVAR_G1000_MFD_SOFTKEY_11,
+    HVAR_G1000_MFD_SOFTKEY_12,
+    HVAR_G1000_MFD_DIRECTTO,
+    HVAR_G1000_MFD_ENT,
+    HVAR_G1000_MFD_CLR_LONG,
+    HVAR_G1000_MFD_CLR,
+    HVAR_G1000_MFD_MENU,
+    HVAR_G1000_MFD_FPL,
+    HVAR_G1000_MFD_PROC,
+    HVAR_G1000_MFD_UPPER_INC,
+    HVAR_G1000_MFD_UPPER_DEC,
+    HVAR_G1000_MFD_PUSH,
+    HVAR_G1000_MFD_LOWER_INC,
+    HVAR_G1000_MFD_LOWER_DEC,
+    HVAR_G1000_MFD_RANGE_INC,
+    HVAR_G1000_MFD_RANGE_DEC,
+    HVAR_G1000_MFD_JOYSTICK_PUSH,
     A32NX_FCU_SPD_PUSH,
     A32NX_FCU_SPD_PULL,
     A32NX_FCU_SPD_SET,
@@ -383,6 +384,7 @@ enum EVENT_ID {
     VJOY_BUTTON_15,
     VJOY_BUTTON_16,
     VJOY_BUTTONS_END,
+    SIM_STOP
 };
 
 struct WriteEvent {

diff --git a/release.sh b/release.sh
@@ -1,4 +1,4 @@
-rel=v1.5.1
+rel=v1.5.2
 mkdir release >/dev/null 2>&1
 rm -rf release/$rel >/dev/null 2>&1
 mkdir release/$rel