time for VCS_VERSION to go

firmware/console/eficonsole.cpp

@@ -27,7 +27,6 @@
 #include "eficonsole.h"
 #include "console_io.h"
 #include "mpu_util.h"
-#include "svnversion.h"
 
 static void testCritical() {
 	chDbgCheck(0);
@@ -54,7 +53,7 @@ static void printUid() {
 
 static void sayHello() {
 	efiPrintf(PROTOCOL_HELLO_PREFIX " rusEFI LLC (c) 2012-2024. All rights reserved.");
-	efiPrintf(PROTOCOL_HELLO_PREFIX " rusEFI v%d@%s now=%d", getRusEfiVersion(), VCS_VERSION, getTimeNowMs());
+	efiPrintf(PROTOCOL_HELLO_PREFIX " rusEFI v%d@%d now=%d", getRusEfiVersion(), SIGNATURE_HASH, getTimeNowMs());
 	efiPrintf(PROTOCOL_HELLO_PREFIX " Chibios Kernel:       %s", CH_KERNEL_VERSION);
 	efiPrintf(PROTOCOL_HELLO_PREFIX " Compiled:     " __DATE__ " - " __TIME__ "");
 	efiPrintf(PROTOCOL_HELLO_PREFIX " COMPILER=%s", __VERSION__);

firmware/console/status_loop.cpp

@@ -45,7 +45,6 @@
 #include "main_trigger_callback.h"
 #include "spark_logic.h"
 #include "idle_thread.h"
-#include "svnversion.h"
 #include "can_hw.h"
 #include "periodic_thread_controller.h"
 #include "cdm_ion_sense.h"
@@ -96,8 +95,8 @@ static Timer printVersionTimer;
 
 static void printRusefiVersion(const char *engineTypeName, const char *firmwareBuildId) {
 	// VersionChecker in rusEFI console is parsing these version string, please follow the expected format
-	efiPrintfProto(PROTOCOL_VERSION_TAG, "%d@%s %s %s %d",
-			getRusEfiVersion(), VCS_VERSION,
+	efiPrintfProto(PROTOCOL_VERSION_TAG, "%d@%d %s %s %d",
+			getRusEfiVersion(), SIGNATURE_HASH,
 			firmwareBuildId,
 			engineTypeName,
 			getTimeNowS());

firmware/controllers/algo/engine2.cpp

@@ -19,10 +19,6 @@
 #include "injector_model.h"
 #include "tunerstudio.h"
 
-#if EFI_PROD_CODE
-#include "svnversion.h"
-#endif
-
 #if ! EFI_UNIT_TEST
 #include "status_loop.h"
 #endif
@@ -226,10 +222,6 @@ void EngineState::updateTChargeK(int rpm, float tps) {
 }
 #endif
 
-#if EFI_SIMULATOR
-#define VCS_VERSION "123"
-#endif
-
 void TriggerConfiguration::update() {
 	VerboseTriggerSynchDetails = isVerboseTriggerSynchDetails();
 	TriggerType = getType();

firmware/controllers/engine_controller.cpp

@@ -750,7 +750,7 @@ static volatile char UNUSED_RAM_SIZE[RAM_UNUSED_SIZE];
 static volatile char UNUSED_CCM_SIZE[CCM_UNUSED_SIZE] CCM_OPTIONAL;
 
 /**
- * See also VCS_VERSION
+ * See also SIGNATURE_HASH
  */
 int getRusEfiVersion(void) {
 	if (UNUSED_RAM_SIZE[0] != 0)

firmware/hw_layer/hardware.cpp

@@ -43,7 +43,6 @@
 #include "sent.h"
 #include "cdm_ion_sense.h"
 #include "trigger_central.h"
-#include "svnversion.h"
 #include "vvt.h"
 #include "trigger_emulator_algo.h"
 #include "boost_control.h"

firmware/svnversion.h

@@ -1,12 +0,0 @@
-// This file was generated by Version2Header
-// Tue Sep 05 00:41:44 UTC 2023
-
-
-#ifndef GIT_HASH
-#define GIT_HASH "5b6dcd29f09ecc1603b139481734936d7161fa9a"
-#endif
-
-
-#ifndef VCS_VERSION
-#define VCS_VERSION "65034"
-#endif

simulator/simulator/svnversion.h

@@ -1,6 +0,0 @@
-
-// this is less important for simulator
-
-#ifndef VCS_VERSION
-#define VCS_VERSION "simulator"
-#endif

unit_tests/global.h

@@ -53,7 +53,6 @@ void chDbgAssert(int c, char *msg, void *arg);
 }
 #endif /* __cplusplus */
 
-#define VCS_VERSION "321"
 #define RUS_EFI_VERSION_TAG "rusEfiVersion"
 
 #define EFI_ERROR_CODE 0xffffffff