Major release (64-bit)

Author: Scott Vincent

README.md

@@ -10,9 +10,9 @@ You can also run the display on a PC (the same one running FS2020 if you wish) b
 
 Download the following two zip files.
 
-Link: [Latest release of Instrument Panel for Windows](https://github.com/scott-vincent/instrument-panel/releases/latest/download/instrument-panel-v1.7.8-Windows-x64.zip)
+Link: [Latest release of Instrument Panel for Windows](https://github.com/scott-vincent/instrument-panel/releases/latest/download/instrument-panel-v2.0.0-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-v1.7.8-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.0-windows-x64.zip)
 
 Unzip instrument-data-link into its own folder and double-click instrument-data-link.exe to run it.
 
@@ -36,10 +36,13 @@ sudo apt install liballegro5-dev
 To Download:
 ```
 tag=`curl -s -i https://github.com/scott-vincent/instrument-panel/releases/latest|grep location|cut -d '/' -f 8|tr -d '\r'`
-wget https://github.com/scott-vincent/instrument-panel/releases/download/$tag/instrument-panel-$tag-raspi4.tar.gz
+wget https://github.com/scott-vincent/instrument-panel/releases/download/$tag/instrument-panel-$tag-raspi5-64.tar.gz
 tar -xf instrument-panel-v* --one-top-level
 rm instrument-panel-v*.gz
 ```
+
+NOTE: Version 2.0.0 and later is built for 64-bit OS only. If you are running a 32-bit OS please download version 1.7.8 instead.
+
 To Run:
 
 Make sure you do this from a terminal started under a desktop session, not using SSH.
@@ -58,7 +61,7 @@ Power/Lights Panel: https://github.com/scott-vincent/power-lights-panel
 
 # Releases
 
-Ready-built releases for Windows x64 and Raspberry Pi 4 can be found by clicking on the Releases section on the right of this readme.
+Ready-built releases for Windows x64 and Raspberry Pi 5 (64-bit) can be found by clicking on the Releases section on the right of this readme. The newer releases (v2.0.0 and later) will also run fine on a Raspberry Pi 4 (64-bit).
 
 # Introduction
 

instrument-panel/globals.cpp

@@ -87,7 +87,7 @@ void identifyAircraft(char* aircraft)
 /// <summary>
 /// Server can send us a delta rather than full data so we need to unpack it.
 /// </summary>
-void receiveDelta(char *deltaData, long deltaSize, char* simVarsPtr)
+void receiveDelta(char *deltaData, int deltaSize, char* simVarsPtr)
 {
     char* dataPtr = deltaData;
 

instrument-panel/instrument-panel.cpp

@@ -91,6 +91,12 @@
 #include "savageCub/comSavageCub.h"
 #include "savageCub/xpdrSavageCub.h"
 
+// If you don't have any hardware knobs uncomment the next line
+//#define NoKnobs
+
+// If you have an older Raspberry Pi uncomment the next line to use WiringPi instead of gpiod
+//#define NoGpiod
+
 #ifdef NoKnobs
 const bool HaveHardwareKnobs = false;
 #else

instrument-panel/instruments/adf.cpp

@@ -130,7 +130,7 @@ void adf::update()
     }
 
     // Check for position or size change
-    long *settings = globals.simVars->readSettings(name, xPos, yPos, size);
+    int *settings = globals.simVars->readSettings(name, xPos, yPos, size);
 
     xPos = settings[0];
     yPos = settings[1];

instrument-panel/instruments/adi.cpp

@@ -174,7 +174,7 @@ void adi::render()
 void adi::update()
 {
     // Check for position or size change
-    long *settings = globals.simVars->readSettings(name, xPos, yPos, size);
+    int *settings = globals.simVars->readSettings(name, xPos, yPos, size);
 
     xPos = settings[0];
     yPos = settings[1];

instrument-panel/instruments/alt.cpp

@@ -227,7 +227,7 @@ void alt::update()
     }
 
     // Check for position or size change
-    long *settings = globals.simVars->readSettings(name, xPos, yPos, size);
+    int *settings = globals.simVars->readSettings(name, xPos, yPos, size);
 
     xPos = settings[0];
     yPos = settings[1];
@@ -290,7 +290,8 @@ void alt::updateKnobs()
     int diff = (val - prevVal) / 2;
     bool switchBox = false;
 
-    if (prevValSb == 0) {
+    // Don't set pressure in Navigation mode
+    if (simVars->sbMode == 4 || prevValSb == 0) {
         prevValSb = simVars->sbEncoder[2];
     }
     else if (simVars->sbEncoder[2] != prevValSb) {
@@ -324,6 +325,142 @@ void alt::updateKnobs()
             lastCalAdjust = 0;
         }
     }
+
+    // Do all Navigation (G1000) knobs here
+
+    // 2nd knob rotate = MFD Range (Zoom)
+    if (simVars->sbMode != 4 || prevZoomSb == 0) {
+        prevZoomSb = simVars->sbEncoder[2];
+    }
+    else if (simVars->sbEncoder[2] != prevZoomSb) {
+        val = simVars->sbEncoder[2];
+        diff = val - prevZoomSb;
+        if (diff > 0) {
+            globals.simVars->write(KEY_G1000_MFD_RANGE_DEC);
+        }
+        else {
+            globals.simVars->write(KEY_G1000_MFD_RANGE_INC);
+        }
+        prevZoomSb = val;
+    }
+
+    // 3rd knob rotate = MFD Lower
+    if (simVars->sbMode != 4 || prevOuterSb == 0) {
+        prevOuterSb = simVars->sbEncoder[1];
+    }
+    else if (simVars->sbEncoder[1] != prevOuterSb) {
+        val = simVars->sbEncoder[1];
+        diff = val - prevOuterSb;
+        if (diff > 0) {
+            globals.simVars->write(KEY_G1000_MFD_LOWER_INC);
+        }
+        else {
+            globals.simVars->write(KEY_G1000_MFD_LOWER_DEC);
+        }
+        prevOuterSb = val;
+    }
+
+    // 4th knob rotate = MFD Upper
+    if (simVars->sbMode != 4 || prevInnerSb == 0) {
+        prevInnerSb = simVars->sbEncoder[0];
+    }
+    else if (simVars->sbEncoder[0] != prevInnerSb) {
+        val = simVars->sbEncoder[0];
+        diff = val - prevInnerSb;
+        if (diff > 0) {
+            globals.simVars->write(KEY_G1000_MFD_UPPER_INC);
+        }
+        else {
+            globals.simVars->write(KEY_G1000_MFD_UPPER_DEC);
+        }
+        prevInnerSb = val;
+    }
+
+    // Do all Navigation (G1000) pushes here
+
+    // 1st knob click = MFD Enter
+    if (simVars->sbMode != 4 || prevEnterSb == 0) {
+        prevEnterSb = simVars->sbButton[3];
+    }
+    else if (simVars->sbButton[3] != prevEnterSb) {
+        val = simVars->sbButton[3];
+        if (val % 2 == 0) {
+            globals.simVars->write(KEY_G1000_MFD_ENT);
+        }
+        prevEnterSb = val;
+    }
+
+    // 2nd knob click = Button 10 (Follow)
+    if (simVars->sbMode != 4 || prevButton10Sb == 0) {
+        prevButton10Sb = simVars->sbButton[2];
+    }
+    else if (simVars->sbButton[2] != prevButton10Sb) {
+        val = simVars->sbButton[2];
+        if (val % 2 == 0) {
+            globals.simVars->write(KEY_G1000_MFD_SOFTKEY_10);
+        }
+        prevButton10Sb = val;
+    }
+
+    // 3rd knob click = MFD Push
+    if (simVars->sbMode != 4 || prevOuterPushSb == 0) {
+        prevOuterPushSb = simVars->sbButton[1];
+    }
+    else if (simVars->sbButton[1] != prevOuterPushSb) {
+        val = simVars->sbButton[1];
+        if (val % 2 == 0) {
+            globals.simVars->write(KEY_G1000_MFD_PUSH);
+        }
+        prevOuterPushSb = val;
+    }
+
+    // 4th knob click = MFD Push (again)
+    if (simVars->sbMode != 4 || prevInnerPushSb == 0) {
+        prevInnerPushSb = simVars->sbButton[0];
+    }
+    else if (simVars->sbButton[0] != prevInnerPushSb) {
+        val = simVars->sbButton[0];
+        if (val % 2 == 0) {
+            globals.simVars->write(KEY_G1000_MFD_PUSH);
+        }
+        prevInnerPushSb = val;
+    }
+
+    // 2nd button click = Soft Button 5 (IFR High Map / Activate Flight Plan)
+    if (simVars->sbMode != 4 || prevButton5Sb == 0) {
+        prevButton5Sb = simVars->sbButton[6];
+    }
+    else if (simVars->sbButton[6] != prevButton5Sb) {
+        val = simVars->sbButton[6];
+        if (val % 2 == 0) {
+            globals.simVars->write(KEY_G1000_MFD_SOFTKEY_5);
+        }
+        prevButton5Sb = val;
+    }
+
+    // 3rd button click = Soft Button 7 (VFR Map)
+    if (simVars->sbMode != 4 || prevButton7Sb == 0) {
+        prevButton7Sb = simVars->sbButton[5];
+    }
+    else if (simVars->sbButton[5] != prevButton7Sb) {
+        val = simVars->sbButton[5];
+        if (val % 2 == 0) {
+            globals.simVars->write(KEY_G1000_MFD_SOFTKEY_7);
+        }
+        prevButton7Sb = val;
+    }
+
+    // 4th button click = Soft Button 8 (World Map)
+    if (simVars->sbMode != 4 || prevButton8Sb == 0) {
+        prevButton8Sb = simVars->sbButton[4];
+    }
+    else if (simVars->sbButton[4] != prevButton8Sb) {
+        val = simVars->sbButton[4];
+        if (val % 2 == 0) {
+            globals.simVars->write(KEY_G1000_MFD_SOFTKEY_8);
+        }
+        prevButton8Sb = val;
+    }
 }
 
 #endif // !_WIN32

instrument-panel/instruments/alt.h

@@ -21,6 +21,16 @@ class alt : public instrument
     int calKnob = -1;
     int prevVal = 0;
     int prevValSb = 0;
+    int prevZoomSb = 0;
+    int prevOuterSb = 0;
+    int prevInnerSb = 0;
+    int prevOuterPushSb = 0;
+    int prevInnerPushSb = 0;
+    int prevEnterSb = 0;
+    int prevButton10Sb = 0;
+    int prevButton5Sb = 0;
+    int prevButton7Sb = 0;
+    int prevButton8Sb = 0;
     time_t lastCalAdjust = 0;
     time_t now;
 

instrument-panel/instruments/alternate/altFast.cpp

@@ -256,7 +256,7 @@ void altFast::updateCustom(double inhgVal)
     inhg = inhgVal;
 
     // Check for position or size change
-    long *settings = globals.simVars->readSettings(name, xPos, yPos, size);
+    int *settings = globals.simVars->readSettings(name, xPos, yPos, size);
 
     xPos = settings[0];
     yPos = settings[1];

instrument-panel/instruments/alternate/asiFast.cpp

@@ -163,7 +163,7 @@ void asiFast::render()
 void asiFast::update()
 {
     // Check for position or size change
-    long *settings = globals.simVars->readSettings(name, xPos, yPos, size);
+    int *settings = globals.simVars->readSettings(name, xPos, yPos, size);
 
     xPos = settings[0];
     yPos = settings[1];

instrument-panel/instruments/alternate/asiSupersonic.cpp

@@ -92,7 +92,7 @@ void asiSupersonic::render()
 void asiSupersonic::update()
 {
     // Check for position or size change
-    long *settings = globals.simVars->readSettings(name, xPos, yPos, size);
+    int *settings = globals.simVars->readSettings(name, xPos, yPos, size);
 
     xPos = settings[0];
     yPos = settings[1];