From 24e9cf347df75c84b23785351fa32ca1fb9b8069 Mon Sep 17 00:00:00 2001 From: Scott Vincent Date: Wed, 10 Jul 2024 08:59:16 +0100 Subject: [PATCH] New release --- README.md | 4 ++-- power-lights-panel/powerLights-panel.cpp | 2 +- .../settings/power-lights-panel.json | 2 +- power-lights-panel/simvarDefs.cpp | 5 +---- power-lights-panel/simvarDefs.h | 3 --- power-lights-panel/simvars.cpp | 19 ++++++++++--------- release.sh | 2 +- 7 files changed, 16 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index bb8df51..1329910 100644 --- 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.0-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.1-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.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-v2.0.1-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 index 7352043..347dd92 100644 --- 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.0"; +const char* powerLightsVersion = "v1.5.1"; const bool Debug = false; struct globalVars globals; diff --git a/power-lights-panel/settings/power-lights-panel.json b/power-lights-panel/settings/power-lights-panel.json index fdd78e0..8425a79 100644 --- a/power-lights-panel/settings/power-lights-panel.json +++ b/power-lights-panel/settings/power-lights-panel.json @@ -1,6 +1,6 @@ { "Data Link": { - "Host": "192.168.1.143", + "Host": "192.168.1.80", "Port": 52020 }, "GPIO": { diff --git a/power-lights-panel/simvarDefs.cpp b/power-lights-panel/simvarDefs.cpp index 927197b..a1df4d4 100644 --- a/power-lights-panel/simvarDefs.cpp +++ b/power-lights-panel/simvarDefs.cpp @@ -1,7 +1,7 @@ #include #include "simvarDefs.h" -const char* versionString = "v2.0.0"; +const char* versionString = "v2.0.1"; const char* SimVarDefs[][2] = { // Vars for Jetbridge (must come first) @@ -368,10 +368,7 @@ WriteEvent WriteEvents[] = { { EVENT_LANDING_PREPARE_CABIN, "EVENT_LANDING_PREPARE_CABIN" }, { EVENT_SEATS_FOR_LANDING, "EVENT_SEATS_FOR_LANDING" }, { 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" }, { VJOY_BUTTON_2, "VJOY_BUTTON_2" }, diff --git a/power-lights-panel/simvarDefs.h b/power-lights-panel/simvarDefs.h index da6b3e5..0c60385 100644 --- a/power-lights-panel/simvarDefs.h +++ b/power-lights-panel/simvarDefs.h @@ -363,10 +363,7 @@ enum EVENT_ID { EVENT_LANDING_PREPARE_CABIN, EVENT_SEATS_FOR_LANDING, 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 VJOY_BUTTON_1, diff --git a/power-lights-panel/simvars.cpp b/power-lights-panel/simvars.cpp index 7afa663..3973eb8 100644 --- a/power-lights-panel/simvars.cpp +++ b/power-lights-panel/simvars.cpp @@ -88,7 +88,7 @@ void resetConnection(simvars* thisPtr) // Want full data on first connect request.wantFullData = 1; - nextFull = globals.dataRateFps * 2; + nextFull = globals.dataRateFps * 14; globals.dataLinked = false; globals.connected = false; @@ -166,14 +166,15 @@ void dataLink(simvars* thisPtr) while (!globals.quit) { // Poll instrument data link - if (nextFull > 0) { - nextFull--; - request.wantFullData = 0; - } - else { - nextFull = globals.dataRateFps * 2; - request.wantFullData = 1; - } + //if (nextFull > 0) { + // nextFull--; + // request.wantFullData = 0; + //} + //else { + // nextFull = globals.dataRateFps * 2; + // request.wantFullData = 1; + //} + request.wantFullData = 1; bytes = sendto(sockfd, (char*)&request, sizeof(request), 0, (SOCKADDR*)&addr, sizeof(addr)); if (bytes > 0) { diff --git a/release.sh b/release.sh index 0b6b474..5cd52a2 100644 --- a/release.sh +++ b/release.sh @@ -1,4 +1,4 @@ -rel=v1.5.0 +rel=v1.5.1 mkdir release >/dev/null 2>&1 rm -rf release/$rel >/dev/null 2>&1 mkdir release/$rel