From a619e1755a579ce64f20b428e98fde4d1d3737a4 Mon Sep 17 00:00:00 2001 From: BitsAndDroids Date: Fri, 10 Jan 2025 16:59:14 +0100 Subject: [PATCH 1/2] fixed due serial configuration --- .../connector_library/BitsAndDroidsFlightConnector.cpp | 4 +++- .../connector_library/BitsAndDroidsFlightConnector.h | 1 + .../connector/src-tauri/connector_library/library.properties | 2 +- crates/connector/src-tauri/tauri.conf.json | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/crates/connector/src-tauri/connector_library/BitsAndDroidsFlightConnector.cpp b/crates/connector/src-tauri/connector_library/BitsAndDroidsFlightConnector.cpp index 2b69d3f..c6d1753 100644 --- a/crates/connector/src-tauri/connector_library/BitsAndDroidsFlightConnector.cpp +++ b/crates/connector/src-tauri/connector_library/BitsAndDroidsFlightConnector.cpp @@ -13,7 +13,9 @@ BitsAndDroidsFlightConnector::BitsAndDroidsFlightConnector() { BitsAndDroidsFlightConnector::BitsAndDroidsFlightConnector(Serial_ *serial) { this->serial = serial; } -#elif defined(ARDUINO_ARCH_ESP32) || defined(ESP8266) || defined(PICO_RP2040) +#endif +#if defined(ARDUINO_ARCH_ESP32) || defined(ESP8266) || defined(PICO_RP2040) || \ + defined(ARDUINO_SAM_DUE) BitsAndDroidsFlightConnector::BitsAndDroidsFlightConnector( HardwareSerial *serial) { this->serial = &Serial; diff --git a/crates/connector/src-tauri/connector_library/BitsAndDroidsFlightConnector.h b/crates/connector/src-tauri/connector_library/BitsAndDroidsFlightConnector.h index c7bd7c3..d0db3e4 100644 --- a/crates/connector/src-tauri/connector_library/BitsAndDroidsFlightConnector.h +++ b/crates/connector/src-tauri/connector_library/BitsAndDroidsFlightConnector.h @@ -644,6 +644,7 @@ class BitsAndDroidsFlightConnector { BitsAndDroidsFlightConnector(); #if defined(ARDUINO_SAM_DUE) BitsAndDroidsFlightConnector(Serial_ *serial); + BitsAndDroidsFlightConnector(HardwareSerial *serial); #elif defined(ESP32) || \ defined( \ ESP8266) // This will handle all boards except ESP32 and Arduino Due diff --git a/crates/connector/src-tauri/connector_library/library.properties b/crates/connector/src-tauri/connector_library/library.properties index 3283803..9498305 100644 --- a/crates/connector/src-tauri/connector_library/library.properties +++ b/crates/connector/src-tauri/connector_library/library.properties @@ -1,5 +1,5 @@ name=Bits and Droids flight sim library -version=1.6.16 +version=1.6.17 author=Bits and Droids maintainer=Bits and Droids sentence=Use serial communication to control Microsoft Flight Simulator 2020. diff --git a/crates/connector/src-tauri/tauri.conf.json b/crates/connector/src-tauri/tauri.conf.json index 8c64a36..89e3c05 100644 --- a/crates/connector/src-tauri/tauri.conf.json +++ b/crates/connector/src-tauri/tauri.conf.json @@ -1,5 +1,5 @@ { - "version": "0.9.10", + "version": "0.9.11", "build": { "beforeDevCommand": "pnpm dev", "beforeBuildCommand": "pnpm run build", From 96221190f1c30bd4a91396050949223e9fbc265e Mon Sep 17 00:00:00 2001 From: Dave <77780263+BitsAndDroids@users.noreply.github.com> Date: Mon, 10 Mar 2025 17:11:31 +0100 Subject: [PATCH 2/2] Vertical speed fix (#305) * Fixed vertical speed variable * added velocitybody to lib --- .../BitsAndDroidsFlightConnector.cpp | 14 +++++++-- .../BitsAndDroidsFlightConnector.h | 6 ++++ .../src-tauri/src/events/outputs.json | 29 ++++++++++++++++++- crates/connector/src-tauri/tauri.conf.json | 2 +- 4 files changed, 47 insertions(+), 4 deletions(-) diff --git a/crates/connector/src-tauri/connector_library/BitsAndDroidsFlightConnector.cpp b/crates/connector/src-tauri/connector_library/BitsAndDroidsFlightConnector.cpp index c6d1753..b1f6ef0 100644 --- a/crates/connector/src-tauri/connector_library/BitsAndDroidsFlightConnector.cpp +++ b/crates/connector/src-tauri/connector_library/BitsAndDroidsFlightConnector.cpp @@ -516,7 +516,18 @@ void BitsAndDroidsFlightConnector::switchHandling() { trueVerticalSpeed = cutValue.toInt(); break; } - + case 331: { + velocityBodyX = cutValue.toInt(); + break; + } + case 332: { + velocityBodyY = cutValue.toInt(); + break; + } + case 341: { + velocityBodyZ = cutValue.toInt(); + break; + } case 326: { indicatedAirspeed = cutValue.toInt(); break; @@ -529,7 +540,6 @@ void BitsAndDroidsFlightConnector::switchHandling() { indicatedAltitude2 = cutValue.toInt(); break; } - case 337: { kohlmanAltimeter = cutValue.toInt(); break; diff --git a/crates/connector/src-tauri/connector_library/BitsAndDroidsFlightConnector.h b/crates/connector/src-tauri/connector_library/BitsAndDroidsFlightConnector.h index d0db3e4..53062b0 100644 --- a/crates/connector/src-tauri/connector_library/BitsAndDroidsFlightConnector.h +++ b/crates/connector/src-tauri/connector_library/BitsAndDroidsFlightConnector.h @@ -707,6 +707,9 @@ class BitsAndDroidsFlightConnector { int getIndicatedAltitudeCalibrated() { return indicatedAltitudeCalibrated; }; int getIndicatedHeading() { return indicatedHeading; }; int getIndicatedGPSGroundspeed() { return indicatedGPSGroundspeed; }; + int getVelocityBodyX() { return velocityBodyX; }; + int getVelocityBodyY() { return velocityBodyY; }; + int getVelocityBodyZ() { return velocityBodyZ; }; int getTrueVerticalSpeed() { return trueVerticalSpeed; }; int getLastPrefix(); @@ -937,6 +940,9 @@ class BitsAndDroidsFlightConnector { int indicatedAltitudeCalibrated; int indicatedHeading; int indicatedGPSGroundspeed; + int velocityBodyX; + int velocityBodyY; + int velocityBodyZ; int trueVerticalSpeed; int headingGyro; diff --git a/crates/connector/src-tauri/src/events/outputs.json b/crates/connector/src-tauri/src/events/outputs.json index 34394b9..d097432 100644 --- a/crates/connector/src-tauri/src/events/outputs.json +++ b/crates/connector/src-tauri/src/events/outputs.json @@ -469,13 +469,40 @@ }, { "simvar": "VERTICAL SPEED", - "metric": "Feet per second", + "metric": "Feet per minute", "update_every": 10, "cb_text": "Vertical speed", "id": 330, "output_type": "integer", "category": "Data" }, + { + "simvar": "VELOCITY BODY X", + "metric": "Feet per minute", + "update_every": 10, + "cb_text": "Velocity body x", + "id": 331, + "output_type": "integer", + "category": "Data" + }, + { + "simvar": "VELOCITY BODY Y", + "metric": "Feet per minute", + "update_every": 10, + "cb_text": "Velocity body y", + "id": 332, + "output_type": "integer", + "category": "Data" + }, + { + "simvar": "VELOCITY BODY Z", + "metric": "Feet per minute", + "update_every": 10, + "cb_text": "Velocity body z", + "id": 341, + "output_type": "integer", + "category": "Data" + }, { "simvar": "TITLE", "metric": "NULL", diff --git a/crates/connector/src-tauri/tauri.conf.json b/crates/connector/src-tauri/tauri.conf.json index 89e3c05..2abc479 100644 --- a/crates/connector/src-tauri/tauri.conf.json +++ b/crates/connector/src-tauri/tauri.conf.json @@ -1,5 +1,5 @@ { - "version": "0.9.11", + "version": "0.10.0", "build": { "beforeDevCommand": "pnpm dev", "beforeBuildCommand": "pnpm run build",