FOME-Tech
/
fome-fw
mirror of https://github.com/FOME-Tech/fome-fw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

switch to use gitversion.h

This commit is contained in:
Matthew Kennedy 2023-02-22 15:39:27 -08:00
parent 9e32f28f0d
commit bc0444acdb
9 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/console/binary/tunerstudio.cpp
View File

@ -80,7 +80,7 @@
#include <string.h>
#include "bench_test.h"
#include "svnversion.h"
#include "gitversion.h"
#include "status_loop.h"
#include "mmc_card.h"
@ -387,7 +387,7 @@ static void handleTestCommand(TsChannelBase* tsChannel) {
* extension of the protocol to simplify troubleshooting
*/
tunerStudioDebug(tsChannel, "got T (Test)");
tsChannel->write((const uint8_t*)VCS_VERSION, sizeof(VCS_VERSION));
tsChannel->write((const uint8_t*)GIT_HASH_SHORT, sizeof(GIT_HASH_SHORT));
chsnprintf(testOutputBuffer, sizeof(testOutputBuffer), " %d %d", engine->engineState.warnings.lastErrorCode, tsState.testCommandCounter);
tsChannel->write((const uint8_t*)testOutputBuffer, strlen(testOutputBuffer));
@ -627,7 +627,7 @@ extern CommandHandler console_line_callback;
static void handleGetVersion(TsChannelBase* tsChannel) {
char versionBuffer[32];
chsnprintf(versionBuffer, sizeof(versionBuffer), "rusEFI v%d@%s", getRusEfiVersion(), VCS_VERSION);
chsnprintf(versionBuffer, sizeof(versionBuffer), "rusEFI v%d@%s", getRusEfiVersion(), GIT_HASH_SHORT);
tsChannel->sendResponse(TS_CRC, (const uint8_t *) versionBuffer, strlen(versionBuffer) + 1);
}

5
firmware/console/eficonsole.cpp
View File

@ -26,7 +26,7 @@
#include "eficonsole.h"
#include "console_io.h"
#include "svnversion.h"
#include "gitversion.h"
static void testCritical() {
chDbgCheck(0);
@ -38,7 +38,8 @@ static void myerror() {
static void sayHello() {
efiPrintf(PROTOCOL_HELLO_PREFIX " rusEFI LLC (c) 2012-2023. All rights reserved.");
efiPrintf(PROTOCOL_HELLO_PREFIX " rusEFI v%d@%s", getRusEfiVersion(), VCS_VERSION);
efiPrintf(PROTOCOL_HELLO_PREFIX " built from " GIT_HASH);
efiPrintf(PROTOCOL_HELLO_PREFIX " rusEFI v%d", getRusEfiVersion());
efiPrintf(PROTOCOL_HELLO_PREFIX " Chibios Kernel: %s", CH_KERNEL_VERSION);
efiPrintf(PROTOCOL_HELLO_PREFIX " Compiled: " __DATE__ " - " __TIME__ "");
efiPrintf(PROTOCOL_HELLO_PREFIX " COMPILER=%s", __VERSION__);

4
firmware/console/status_loop.cpp
View File

@ -44,7 +44,7 @@
#include "main_trigger_callback.h"
#include "spark_logic.h"
#include "idle_thread.h"
#include "svnversion.h"
#include "gitversion.h"
#include "can_hw.h"
#include "periodic_thread_controller.h"
#include "binary_logging.h"
@ -128,7 +128,7 @@ 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,
getRusEfiVersion(), GIT_HASH_SHORT,
firmwareBuildId,
engineTypeName,
getTimeNowS());

9
firmware/controllers/algo/engine2.cpp
View File

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

2
firmware/controllers/engine_controller.cpp
View File

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

2
firmware/hw_layer/hardware.cpp
View File

@ -39,7 +39,7 @@
#include "histogram.h"
#include "sent.h"
#include "trigger_central.h"
#include "svnversion.h"
#include "gitversion.h"
#include "vvt.h"
#include "trigger_emulator_algo.h"
#include "boost_control.h"

3
misc/jenkins/build_working_folder.sh
View File

@ -63,9 +63,6 @@ cp firmware/tunerstudio/generated/$INI_FILE_OVERRIDE $FOLDER
INI_FILE_OVERRIDE=""
RUSEFI_CONSOLE_SETTINGS=""
# users probably do not really care for this file
# cp firmware/svnversion.h $FOLDER
cp -r misc/install/STM32_Programmer_CLI $CONSOLE_FOLDER
# 407 has additional version of firmware
#cp firmware/deliver/rusefi_no_asserts.bin $FOLDER

6
simulator/simulator/svnversion.h
View File

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

1
unit_tests/global.h
View File

@ -53,7 +53,6 @@ void chDbgAssert(int c, char *msg, void *arg);
#define US_TO_NT_MULTIPLIER 100
#define VCS_VERSION "321"
#define RUS_EFI_VERSION_TAG "rusEfiVersion"
#define INLINE inline