From 6b97f23eae4f7c1309ad59d4b1397318c32581ab Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Tue, 31 Oct 2023 09:30:58 -0400
Subject: [PATCH] pursuit of truth

---
 firmware/console/console_io.h              | 10 ----------
 firmware/controllers/algo/rusefi_enums.h   |  1 +
 firmware/controllers/core/common_headers.h |  8 +-------
 firmware/hw_layer/sensors/hip9011_logic.h  |  1 -
 firmware/libfirmware                       |  2 +-
 firmware/pch/pch.h                         |  1 -
 simulator/simulator/efifeatures.h          |  6 ++++++
 7 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/firmware/console/console_io.h b/firmware/console/console_io.h
index 4c39f317d8..1a8ec7c8f1 100644
--- a/firmware/console/console_io.h
+++ b/firmware/console/console_io.h
@@ -6,19 +6,9 @@
  */
 
 #pragma once
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
 
 typedef void (*CommandHandler)(char *);
 
-#include "efifeatures.h"
-
 void consoleOutputBuffer(const uint8_t *buf, int size);
 void startConsole(CommandHandler console_line_callback_p);
 void onDataArrived(bool valid);
diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h
index b7a4295658..aecfca12d1 100644
--- a/firmware/controllers/algo/rusefi_enums.h
+++ b/firmware/controllers/algo/rusefi_enums.h
@@ -13,6 +13,7 @@
 
 #pragma once
 
+#include <rusefi/true_false.h>
 #include "efifeatures.h"
 #include "obd_error_codes.h"
 #include "live_data_ids.h"
diff --git a/firmware/controllers/core/common_headers.h b/firmware/controllers/core/common_headers.h
index 21214b22d4..4ec3c1a030 100644
--- a/firmware/controllers/core/common_headers.h
+++ b/firmware/controllers/core/common_headers.h
@@ -9,13 +9,7 @@
 
 #pragma once
 
-#ifndef FALSE
-#define FALSE (0)
-#endif /* FALSE */
-
-#ifndef TRUE
-#define TRUE (!(FALSE))
-#endif /* TRUE */
+#include <rusefi/true_false.h>
 
 #ifdef __cplusplus
 #define EXTERNC extern "C"
diff --git a/firmware/hw_layer/sensors/hip9011_logic.h b/firmware/hw_layer/sensors/hip9011_logic.h
index ee0a368339..bea5f2f33d 100644
--- a/firmware/hw_layer/sensors/hip9011_logic.h
+++ b/firmware/hw_layer/sensors/hip9011_logic.h
@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include "efifeatures.h"
 #include "rusefi_enums.h"
 
 /* enable debug by default */
diff --git a/firmware/libfirmware b/firmware/libfirmware
index 3ece6562d3..83091c54c5 160000
--- a/firmware/libfirmware
+++ b/firmware/libfirmware
@@ -1 +1 @@
-Subproject commit 3ece6562d3b2a037430ffde62ca3539de657db29
+Subproject commit 83091c54c56c5b455574851cf7e0ee39672f70e6
diff --git a/firmware/pch/pch.h b/firmware/pch/pch.h
index 17f6632ed2..f7d6cf266f 100644
--- a/firmware/pch/pch.h
+++ b/firmware/pch/pch.h
@@ -19,7 +19,6 @@
 #include <rusefi/efistringutil.h>
 
 #include "global.h"
-#include "efifeatures.h"
 #include "rusefi_generated.h"
 #include "loggingcentral.h"
 #include "error_handling.h"
diff --git a/simulator/simulator/efifeatures.h b/simulator/simulator/efifeatures.h
index 6f240689aa..6f30a6eabc 100644
--- a/simulator/simulator/efifeatures.h
+++ b/simulator/simulator/efifeatures.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <rusefi/true_false.h>
+
 // see SIM_SD1_PORT and SIM_SD2_PORT
 #define TS_PRIMARY_UxART_PORT SD1
 #define EFI_TS_PRIMARY_IS_SERIAL TRUE
@@ -168,3 +170,7 @@
 
 #define EFI_LUA TRUE
 #define LUA_USER_HEAP 100000
+
+#ifndef TRUE
+ fail("Truth not found");
+#endif