Merge branch 'master' into improved-reverse-thrust-limit

.github/CHANGELOG.md

@@ -84,6 +84,7 @@
 1. [FWC] Implement non-cancellable master warning for overspeed and gear not down - @tracernz (Mike)
 1. [EFB] Checklist restructure to add more capabilities and use json configs - @frankkopp (Frank Kopp)
 1. [FLIGHTMODEL] Landing lights or RAT extended now have drag - @Crocket63 (crocket)
+1. [FADEC] Fadec rewrite/cleanup/commenting using cpp framework - @frankkopp (Frank Kopp)
 1. [ATHR/FADEC] Improved reverse thrust limit - @aguther (Andreas Guther)
 
 ## 0.11.0

fbw-a32nx/src/base/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/panel/panel.cfg

@@ -132,7 +132,7 @@ background_color = 0,0,0
 
 htmlgauge00 = WasmInstrument/WasmInstrument.html?wasm_module=systems.wasm&wasm_gauge=systems,0,0,1,1
 htmlgauge01 = WasmInstrument/WasmInstrument.html?wasm_module=fbw.wasm&wasm_gauge=fbw,0,0,1,1
-htmlgauge02 = WasmInstrument/WasmInstrument.html?wasm_module=fadec.wasm&wasm_gauge=FadecGauge,0,0,1,1
+htmlgauge02 = WasmInstrument/WasmInstrument.html?wasm_module=fadec-a32nx.wasm&wasm_gauge=Gauge_Fadec,0,0,1,1
 htmlgauge03 = WasmInstrument/WasmInstrument.html?wasm_module=extra-backend-a32nx.wasm&wasm_gauge=Gauge_Extra_Backend,0,0,1,1
 
 [VCockpit18]

fbw-a32nx/src/wasm/CMakeLists.txt

@@ -5,9 +5,10 @@ set(OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../out/flybywire-aircraft-a3
 add_definitions(-DA32NX)
 
 add_subdirectory(extra-backend-a32nx)
+add_subdirectory(fadec_a32nx)
 
-# FIXME: remove the if-clause as soon as all components are using CMake
+# these are only here to allow CMake compatible IDEs (JetBrains' Clion for example) to show systax
+# highlighting and allow code navigation
 if (WIN32)
-    add_subdirectory(fadec_a320)
     add_subdirectory(fbw_a320)
 endif ()