v3.09 Fixed some bugs found in the XPDR switch position code

sparker256 · Feb 26, 2024 · 78bded0 · 78bded0
1 parent f64c9cb
commit 78bded0
Show file tree

Hide file tree

Showing 16 changed files with 62 additions and 17 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -5,7 +5,7 @@ on: [push]
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: RelWithDebInfo
-  XSP_VERSION: 3.0.8
+  XSP_VERSION: 3.0.9
 
 jobs:
   build:
@@ -21,7 +21,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: "Windows: Configure environment"
       if: runner.os == 'Windows'
@@ -59,7 +59,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions/download-artifact@v3
         with:

diff --git a/Xsaitekpanels/D2B_config.txt b/Xsaitekpanels/D2B_config.txt
@@ -1,6 +1,6 @@
 Fill this file with your indicator assignments!
 
-This is for Xsaitekpanels 3.08
+This is for Xsaitekpanels 3.09
 
 If there is no # sign starting the line it is a comment.
 There are two kinds of data reference that can be used.

diff --git a/Xsaitekpanels/D2B_config2.txt b/Xsaitekpanels/D2B_config2.txt
@@ -1,6 +1,6 @@
 Fill this file with your indicator assignments!
 
-This is for Xsaitekpanels 3.07
+This is for Xsaitekpanels 3.09
 
 If there is no # sign starting the line it is a comment.
 There are two kinds of data reference that can be used.

diff --git a/Xsaitekpanels/D2B_config3.txt b/Xsaitekpanels/D2B_config3.txt
@@ -1,6 +1,6 @@
 Fill this file with your indicator assignments!
 
-This is for Xsaitekpanels 3.08
+This is for Xsaitekpanels 3.09
 
 If there is no # sign starting the line it is a comment.
 There are two kinds of data reference that can be used.

diff --git a/Xsaitekpanels/Documentation/ChangeLog.txt b/Xsaitekpanels/Documentation/ChangeLog.txt
@@ -244,4 +244,6 @@ Ver 3.06 Geoff Lohr  changed menu from reopen to open or reopen, can load all pa
 
 Ver 3.07 Geoff Lohr amber gear lights option added to ini, added less agressive gear logging option and more detailed gear led logging, led gear writes only when needed now, fixed high CPU usage bug with bat switch off when no panel output had yet been given. Removed bug in lower adf tens, improved fps on radio panel and while holding fn button. Huge speed improvements and very little fps drop when writing displays.
 
-Ver 3.08 Geoff Lohr Fix gear led bug using ledenable option 2, add debug menu and more debug options 
+Ver 3.08 Geoff Lohr Fix gear led bug using ledenable option 2, add debug menu and more debug options
+
+Ver 3.09 Fixed some bugs found in the XPDR switch position code.
diff --git a/Xsaitekpanels/Documentation/XsaitekpanelsUsersManual.pdf b/Xsaitekpanels/Documentation/XsaitekpanelsUsersManual.pdf
diff --git a/Xsaitekpanels/lin_x64/Xsaitekpanels.xpl b/Xsaitekpanels/lin_x64/Xsaitekpanels.xpl
diff --git a/Xsaitekpanels/mac_x64/Xsaitekpanels.xpl b/Xsaitekpanels/mac_x64/Xsaitekpanels.xpl
diff --git a/Xsaitekpanels/win_x64/Xsaitekpanels.xpl b/Xsaitekpanels/win_x64/Xsaitekpanels.xpl
diff --git a/Xsaitekpanels/xsaitekpanels.ini b/Xsaitekpanels/xsaitekpanels.ini
@@ -4,7 +4,7 @@
 ;
 ;William R Good
 
-Version = 3.08
+Version = 3.09
 
 ;File id tag allows the user to test if they have the correct xsaitekpanels.ini file | 0 = default | xx = integer of your choice
 ;The IDTag value is saved to the dataref bgood/xsaitekpanels/idtag  Wait .5 seconds and read this dataref to see if it matches

diff --git a/docs/ChangeLog.txt b/docs/ChangeLog.txt
@@ -244,4 +244,6 @@ Ver 3.06 Geoff Lohr  changed menu from reopen to open or reopen, can load all pa
 
 Ver 3.07 Geoff Lohr amber gear lights option added to ini, added less agressive gear logging option and more detailed gear led logging, led gear writes only when needed now, fixed high CPU usage bug with bat switch off when no panel output had yet been given. Removed bug in lower adf tens, improved fps on radio panel and while holding fn button. Huge speed improvements and very little fps drop when writing displays.
 
-Ver 3.08 Geoff Lohr Fix gear led bug using ledenable option 2, add debug menu and more debug options 
+Ver 3.08 Geoff Lohr Fix gear led bug using ledenable option 2, add debug menu and more debug options
+
+Ver 3.09 Fixed some bugs found in the XPDR switch position code.
diff --git a/docs/XsaitekpanelsUsersManual.odt b/docs/XsaitekpanelsUsersManual.odt
diff --git a/docs/XsaitekpanelsUsersManual.pdf b/docs/XsaitekpanelsUsersManual.pdf
diff --git a/src/radiopanels.cpp b/src/radiopanels.cpp
@@ -3058,7 +3058,6 @@ void process_upper_xpdr_switch()
                 }
                 Last_Upper_Coarse_Dn[radnum] = testbit(radiobuf[radnum],UPPER_COARSE_DN);
 
-
                 if (testbit(radiobuf[radnum],UPPER_ACT_STBY)) {
                     XPLMSetDatai(Rad1UpperXpdrBaroStdRemapableData, 1);
                 }
@@ -3733,6 +3732,10 @@ void process_upper_xpdr_switch()
                     }
                 }
                 Last_Upper_Coarse_Dn[radnum] = testbit(radiobuf[radnum],UPPER_COARSE_DN);
+
+                if (testbit(radiobuf[radnum],UPPER_ACT_STBY)) {
+                    XPLMSetDatai(Rad1UpperXpdrBaroStdRemapableData, 1);
+                }
             }
 
             upxpdrcode[radnum] = XPLMGetDatai(XpdrCode);
@@ -3977,6 +3980,10 @@ void process_upper_xpdr_switch()
                     }
                 }
                 Last_Upper_Coarse_Dn[radnum] = testbit(radiobuf[radnum],UPPER_COARSE_DN);
+
+                if (testbit(radiobuf[radnum],UPPER_ACT_STBY)) {
+                    XPLMSetDatai(Rad2UpperXpdrBaroStdRemapableData, 1);
+                }
             }
 
             upxpdrcode[radnum] = XPLMGetDatai(XpdrCode);
@@ -4206,7 +4213,6 @@ void process_upper_xpdr_switch()
                }
                Last_Upper_Coarse_Up[radnum] = testbit(radiobuf[radnum],UPPER_COARSE_UP);
 
-
                if ((Last_Upper_Coarse_Dn[radnum] == 1) && (testbit(radiobuf[radnum],UPPER_COARSE_DN) == 0)) {
                    upqnhdbnccordec[radnum]++;
                    if (upqnhdbnccordec[radnum] > radspeed) {
@@ -4219,6 +4225,11 @@ void process_upper_xpdr_switch()
                    }
                }
 
+               Last_Upper_Coarse_Dn[radnum] = testbit(radiobuf[radnum],UPPER_COARSE_DN);
+
+               if (testbit(radiobuf[radnum],UPPER_ACT_STBY)) {
+                   XPLMSetDatai(Rad3UpperXpdrBaroStdRemapableData, 1);
+               }
            }
 
            upxpdrcode[radnum] = XPLMGetDatai(XpdrCode);
@@ -7344,6 +7355,10 @@ void process_lower_xpdr_switch()
                     }
                 }
                 Last_Lower_Coarse_Dn[radnum] = testbit(radiobuf[radnum],LOWER_COARSE_DN);
+
+                if(testbit(radiobuf[radnum],LOWER_ACT_STBY)) {
+                  XPLMSetDatai(Rad1LowerXpdrBaroStdRemapableData, 1);
+                }
             }
 
             loxpdrcode[radnum] = XPLMGetDatai(XpdrCode);
@@ -7583,6 +7598,10 @@ void process_lower_xpdr_switch()
                     }
                 }
                 Last_Lower_Coarse_Dn[radnum] = testbit(radiobuf[radnum],LOWER_COARSE_DN);
+
+                if(testbit(radiobuf[radnum],LOWER_ACT_STBY)) {
+                  XPLMSetDatai(Rad2LowerXpdrBaroStdRemapableData, 1);
+                }
             }
 
             loxpdrcode[radnum] = XPLMGetDatai(XpdrCode);
@@ -7821,6 +7840,10 @@ void process_lower_xpdr_switch()
                     }
                 }
                 Last_Lower_Coarse_Dn[radnum] = testbit(radiobuf[radnum],LOWER_COARSE_DN);
+
+                if(testbit(radiobuf[radnum],LOWER_ACT_STBY)) {
+                  XPLMSetDatai(Rad3LowerXpdrBaroStdRemapableData, 1);
+                }
             }
 
             loxpdrcode[radnum] = XPLMGetDatai(XpdrCode);

diff --git a/src/readinifile.cpp b/src/readinifile.cpp
@@ -2443,6 +2443,9 @@ void process_read_ini_file()
         rad1_upper_xpdr_mode_remapable = getOptionToString("rad1_upper_xpdr_mode");
         Rad1UpperXpdrRemapableMode = XPLMFindDataRef(rad1_upper_xpdr_mode_remapable.c_str());
 
+        rad1_upper_xpdr_baro_std_data_remapable = getOptionToString("rad1_upper_xpdr_baro_std_data");
+        Rad1UpperXpdrBaroStdRemapableData = XPLMFindDataRef(rad1_upper_xpdr_baro_std_data_remapable.c_str());
+
         rad1_upper_xpdr_baro_data_remapable = getOptionToString("rad1_upper_xpdr_baro_data");
         Rad1UpperXpdrBaroRemapableData = XPLMFindDataRef(rad1_upper_xpdr_baro_data_remapable.c_str());
 
@@ -2713,6 +2716,9 @@ void process_read_ini_file()
         rad1_lower_xpdr_mode_remapable = getOptionToString("rad1_lower_xpdr_mode");
         Rad1LowerXpdrRemapableMode = XPLMFindDataRef(rad1_lower_xpdr_mode_remapable.c_str());
 
+        rad1_lower_xpdr_baro_std_data_remapable = getOptionToString("rad1_lower_xpdr_baro_std_data");
+        Rad1LowerXpdrBaroStdRemapableData = XPLMFindDataRef(rad1_lower_xpdr_baro_std_data_remapable.c_str());
+
         rad1_lower_xpdr_baro_data_remapable = getOptionToString("rad1_lower_xpdr_baro_data");
         Rad1LowerXpdrBaroRemapableData = XPLMFindDataRef(rad1_lower_xpdr_baro_data_remapable.c_str());
 
@@ -2983,6 +2989,9 @@ void process_read_ini_file()
         rad2_upper_xpdr_mode_remapable = getOptionToString("rad2_upper_xpdr_mode");
         Rad2UpperXpdrRemapableMode = XPLMFindDataRef(rad2_upper_xpdr_mode_remapable.c_str());
 
+        rad2_upper_xpdr_baro_std_data_remapable = getOptionToString("rad2_upper_xpdr_baro_std_data");
+        Rad2UpperXpdrBaroStdRemapableData = XPLMFindDataRef(rad2_upper_xpdr_baro_std_data_remapable.c_str());
+
         rad2_upper_xpdr_baro_data_remapable = getOptionToString("rad2_upper_xpdr_baro_data");
         Rad2UpperXpdrBaroRemapableData = XPLMFindDataRef(rad2_upper_xpdr_baro_data_remapable.c_str());
 
@@ -3254,8 +3263,11 @@ void process_read_ini_file()
         rad2_lower_xpdr_mode_remapable = getOptionToString("rad2_lower_xpdr_mode");
         Rad2LowerXpdrRemapableMode = XPLMFindDataRef(rad2_lower_xpdr_mode_remapable.c_str());
 
+        rad2_lower_xpdr_baro_std_data_remapable = getOptionToString("rad2_lower_xpdr_baro_std_data");
+        Rad2LowerXpdrBaroStdRemapableData = XPLMFindDataRef(rad2_lower_xpdr_baro_std_data_remapable.c_str());
+
         rad2_lower_xpdr_baro_data_remapable = getOptionToString("rad2_lower_xpdr_baro_data");
-        Rad2LowerXpdrBaroStdRemapableData = XPLMFindDataRef(rad2_lower_xpdr_baro_data_remapable.c_str());
+        Rad2LowerXpdrBaroRemapableData = XPLMFindDataRef(rad2_lower_xpdr_baro_data_remapable.c_str());
 
         rad2_lower_xpdr_baro_up_remapable_cmd = getOptionToString("rad2_lower_xpdr_baro_up_cmd");
         Rad2LowrXpdrBaroUpRemapableCmd = XPLMFindCommand(rad2_lower_xpdr_baro_up_remapable_cmd.c_str());
@@ -3523,8 +3535,11 @@ void process_read_ini_file()
         rad3_upper_xpdr_mode_remapable = getOptionToString("rad3_upper_xpdr_mode");
         Rad3UpperXpdrRemapableMode = XPLMFindDataRef(rad3_upper_xpdr_mode_remapable.c_str());
 
+        rad3_upper_xpdr_baro_std_data_remapable = getOptionToString("rad3_upper_xpdr_baro_std_data");
+        Rad3UpperXpdrBaroStdRemapableData = XPLMFindDataRef(rad3_upper_xpdr_baro_std_data_remapable.c_str());
+
         rad3_upper_xpdr_baro_data_remapable = getOptionToString("rad3_upper_xpdr_baro_data");
-        Rad3UpperXpdrBaroStdRemapableData = XPLMFindDataRef(rad3_upper_xpdr_baro_data_remapable.c_str());
+        Rad3UpperXpdrBaroRemapableData = XPLMFindDataRef(rad3_upper_xpdr_baro_data_remapable.c_str());
 
         rad3_upper_xpdr_baro_up_remapable_cmd = getOptionToString("rad3_upper_xpdr_baro_up_cmd");
         Rad3UpperXpdrBaroUpRemapableCmd = XPLMFindCommand(rad3_upper_xpdr_baro_up_remapable_cmd.c_str());
@@ -3794,8 +3809,11 @@ void process_read_ini_file()
         rad3_lower_xpdr_mode_remapable = getOptionToString("rad3_lower_xpdr_mode");
         Rad3LowerXpdrRemapableMode = XPLMFindDataRef(rad3_lower_xpdr_mode_remapable.c_str());
 
+        rad3_lower_xpdr_baro_std_data_remapable = getOptionToString("rad3_lower_xpdr_baro_std_data");
+        Rad3LowerXpdrBaroStdRemapableData = XPLMFindDataRef(rad3_lower_xpdr_baro_std_data_remapable.c_str());
+
         rad3_lower_xpdr_baro_data_remapable = getOptionToString("rad3_lower_xpdr_baro_data");
-        Rad3LowerXpdrBaroStdRemapableData = XPLMFindDataRef(rad3_lower_xpdr_baro_data_remapable.c_str());
+        Rad3LowerXpdrBaroRemapableData = XPLMFindDataRef(rad3_lower_xpdr_baro_data_remapable.c_str());
 
         rad3_lower_xpdr_baro_up_remapable_cmd = getOptionToString("rad3_lower_xpdr_baro_up_cmd");
         Rad3LowrXpdrBaroUpRemapableCmd = XPLMFindCommand(rad3_lower_xpdr_baro_up_remapable_cmd.c_str());

diff --git a/src/saitekpanels.cpp b/src/saitekpanels.cpp
@@ -1,9 +1,9 @@
 // ****** saitekpanels.cpp ***********
 // ****  William R. Good   ***********
-// ****** March 7  2023   **************
+// ****** Febuary 24  2024   **************
 
-#define PLUGIN_VERSION "3.08 stable build " __DATE__ " " __TIME__
-#define PLUGIN_VERSION_NUMBER 308
+#define PLUGIN_VERSION "3.09 stable build " __DATE__ " " __TIME__
+#define PLUGIN_VERSION_NUMBER 309
 
 #include "XPLMDisplay.h"
 #include "XPLMGraphics.h"