fix(fdr2csv): refactor to unify fdr2csv, fix conversion bug (#9324)

* feat(fdr2csv): refactor to unify fdr2csv, fix conversion bug * chore: don't downgrade crate versions * feat(fdr2csv): add option to get raw file version * fix(fdr): fixed wrong storage of parameters * feat(fdr2csv): -o no longer required when -r or -g are present * fix(fdr2csv): correct description of parameters --------- Co-authored-by: Andreas Guther <[email protected]>
flybywiresim · Nov 2, 2024 · 2776100 · 2776100
1 parent c9cfe3c
commit 2776100
Show file tree

Hide file tree

Showing 23 changed files with 426 additions and 1,185 deletions.
diff --git a/fbw-a32nx/src/wasm/fbw_a320/src/recording/FlightDataRecorder.cpp b/fbw-a32nx/src/wasm/fbw_a320/src/recording/FlightDataRecorder.cpp
@@ -140,8 +140,9 @@ void FlightDataRecorder::writeConfiguration() {
   // create structure
   INIStructure iniStructure;
   iniStructure["FLIGHT_DATA_RECORDER"]["ENABLED"] = idIsEnabled->get() == 1 ? "true" : "false";
-  iniStructure["FLIGHT_DATA_RECORDER"]["MAXIMUM_NUMBER_OF_FILES"] = idMaximumFileCount->get();
-  iniStructure["FLIGHT_DATA_RECORDER"]["MAXIMUM_NUMBER_OF_ENTRIES_PER_FILE"] = idMaximumSampleCounter->get();
+  iniStructure["FLIGHT_DATA_RECORDER"]["MAXIMUM_NUMBER_OF_FILES"] = std::to_string(static_cast<int>(idMaximumFileCount->get()));
+  iniStructure["FLIGHT_DATA_RECORDER"]["MAXIMUM_NUMBER_OF_ENTRIES_PER_FILE"] =
+      std::to_string(static_cast<int>(idMaximumSampleCounter->get()));
 
   // write file
   iniFile.write(iniStructure, true);

diff --git a/fbw-a380x/src/wasm/fbw_a380/src/recording/FlightDataRecorder.cpp b/fbw-a380x/src/wasm/fbw_a380/src/recording/FlightDataRecorder.cpp
@@ -144,8 +144,9 @@ void FlightDataRecorder::writeConfiguration() {
   // create structure
   INIStructure iniStructure;
   iniStructure["FLIGHT_DATA_RECORDER"]["ENABLED"] = idIsEnabled->get() == 1 ? "true" : "false";
-  iniStructure["FLIGHT_DATA_RECORDER"]["MAXIMUM_NUMBER_OF_FILES"] = idMaximumFileCount->get();
-  iniStructure["FLIGHT_DATA_RECORDER"]["MAXIMUM_NUMBER_OF_ENTRIES_PER_FILE"] = idMaximumSampleCounter->get();
+  iniStructure["FLIGHT_DATA_RECORDER"]["MAXIMUM_NUMBER_OF_FILES"] = std::to_string(static_cast<int>(idMaximumFileCount->get()));
+  iniStructure["FLIGHT_DATA_RECORDER"]["MAXIMUM_NUMBER_OF_ENTRIES_PER_FILE"] =
+      std::to_string(static_cast<int>(idMaximumSampleCounter->get()));
 
   // write file
   iniFile.write(iniStructure, true);

diff --git a/tools/fdr2csv/a32nx/Cargo.lock → tools/fdr2csv/Cargo.lock b/tools/fdr2csv/a32nx/Cargo.lock → tools/fdr2csv/Cargo.lock
diff --git a/tools/fdr2csv/common/Cargo.toml → tools/fdr2csv/Cargo.toml b/tools/fdr2csv/common/Cargo.toml → tools/fdr2csv/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "fdr2csv_common"
+name = "fdr2csv"
 version = "0.1.0"
 authors = ["FlyByWire Simulations"]
 edition = "2021"

diff --git a/tools/fdr2csv/a320_wrapper.hpp b/tools/fdr2csv/a320_wrapper.hpp
@@ -0,0 +1,7 @@
+#include "../../fbw-a32nx/src/wasm/fbw_a320/src/model/AutopilotLaws_types.h"
+#include "../../fbw-a32nx/src/wasm/fbw_a320/src/model/AutopilotStateMachine_types.h"
+#include "../../fbw-a32nx/src/wasm/fbw_a320/src/model/Autothrust_types.h"
+#include "../../fbw-a32nx/src/wasm/fbw_a320/src/model/ElacComputer_types.h"
+#include "../../fbw-a32nx/src/wasm/fbw_a320/src/model/FacComputer_types.h"
+#include "../../fbw-a32nx/src/wasm/fbw_a320/src/model/SecComputer_types.h"
+#include "../../fbw-a32nx/src/wasm/fbw_a320/src/recording/RecordingDataTypes.h"
diff --git a/tools/fdr2csv/a32nx/Cargo.toml b/tools/fdr2csv/a32nx/Cargo.toml
diff --git a/tools/fdr2csv/a32nx/build.rs b/tools/fdr2csv/a32nx/build.rs
diff --git a/tools/fdr2csv/a32nx/src/main.rs b/tools/fdr2csv/a32nx/src/main.rs