From 5c7334f2e7b5765a14790b02d6813d39712bb991 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Wed, 15 Mar 2023 22:26:49 -0700 Subject: [PATCH] rename simulator --- .github/workflows/build-simulator.yaml | 6 +++--- .gitignore | 4 ++-- .vscode/launch.json | 2 +- firmware/hw_layer/mmc_card.cpp | 2 +- .../src/main/java/com/rusefi/SimulatorExecHelper.java | 2 +- .../ui/src/main/java/com/rusefi/SimulatorHelper.java | 2 +- misc/jenkins/build_simulator.sh | 2 +- misc/jenkins/build_working_folder.sh | 2 +- simulator/Makefile | 4 ++-- simulator/compile.sh | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-simulator.yaml b/.github/workflows/build-simulator.yaml index 4a7d06e90d..21bcad1f5a 100644 --- a/.github/workflows/build-simulator.yaml +++ b/.github/workflows/build-simulator.yaml @@ -44,10 +44,10 @@ jobs: - name: Run Linux Simulator for 10 seconds working-directory: ./simulator/ - run: ./build/rusefi_simulator 10 + run: ./build/fome_simulator 10 # - name: Upload Linux built simulator # uses: actions/upload-artifact@v3 # with: - # name: rusefi_simulator_linux - # path: ./simulator/build/rusefi_simulator + # name: fome_simulator_linux + # path: ./simulator/build/fome_simulator diff --git a/.gitignore b/.gitignore index 953f00b2e3..3c5f7b6f5b 100644 --- a/.gitignore +++ b/.gitignore @@ -29,5 +29,5 @@ gitversion.h.gen # Eclipse .metadata/ -# rusEFI simulator makes logs, ignore those -rusefi_simulator_log.mlg +# FOME simulator makes logs, ignore those +fome_simulator_log.mlg diff --git a/.vscode/launch.json b/.vscode/launch.json index c9676506f1..7635a08afc 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -28,7 +28,7 @@ "name": "Debug simulator (gdb)", "type": "cppdbg", "request": "launch", - "program": "${workspaceFolder}/simulator/build/rusefi_simulator", + "program": "${workspaceFolder}/simulator/build/fome_simulator", "stopAtEntry": false, "cwd": "${workspaceFolder}/simulator/", "environment": [], diff --git a/firmware/hw_layer/mmc_card.cpp b/firmware/hw_layer/mmc_card.cpp index f4a6c9c330..5162ec45fa 100644 --- a/firmware/hw_layer/mmc_card.cpp +++ b/firmware/hw_layer/mmc_card.cpp @@ -491,7 +491,7 @@ public: bool failed = false; SdLogBufferWriter() - : m_stream("rusefi_simulator_log.mlg", std::ios::binary | std::ios::trunc) + : m_stream("fome_simulator_log.mlg", std::ios::binary | std::ios::trunc) { fs_ready = true; } diff --git a/java_console/autotest/src/main/java/com/rusefi/SimulatorExecHelper.java b/java_console/autotest/src/main/java/com/rusefi/SimulatorExecHelper.java index 56c842443e..fe64413a3f 100644 --- a/java_console/autotest/src/main/java/com/rusefi/SimulatorExecHelper.java +++ b/java_console/autotest/src/main/java/com/rusefi/SimulatorExecHelper.java @@ -14,7 +14,7 @@ public class SimulatorExecHelper { private final static NamedThreadFactory THREAD_FACTORY = new NamedThreadFactory("SimulatorExecHelper", true); // see also SimulatorHelper - private static final String SIMULATOR_BINARY = "../simulator/build/rusefi_simulator.exe"; + private static final String SIMULATOR_BINARY = "../simulator/build/fome_simulator.exe"; static Process simulatorProcess; /** diff --git a/java_console/ui/src/main/java/com/rusefi/SimulatorHelper.java b/java_console/ui/src/main/java/com/rusefi/SimulatorHelper.java index 277ab21d77..bd5cd37352 100644 --- a/java_console/ui/src/main/java/com/rusefi/SimulatorHelper.java +++ b/java_console/ui/src/main/java/com/rusefi/SimulatorHelper.java @@ -14,7 +14,7 @@ import static com.rusefi.ui.util.UiUtils.setToolTip; public class SimulatorHelper { private final static ThreadFactory THREAD_FACTORY = new NamedThreadFactory("SimulatorHelper"); - public static final String BINARY = "rusefi_simulator.exe"; + public static final String BINARY = "fome_simulator.exe"; private static Process process; public static boolean isBinaryHere() { diff --git a/misc/jenkins/build_simulator.sh b/misc/jenkins/build_simulator.sh index 73bc9c7dcd..1bc56d3490 100755 --- a/misc/jenkins/build_simulator.sh +++ b/misc/jenkins/build_simulator.sh @@ -11,4 +11,4 @@ rm -rf .dep bash compile.sh ls build cd .. -[ -e simulator/build/rusefi_simulator.exe ] || [ -e simulator/build/rusefi_simulator ] || { echo "SIMULATOR COMPILATION FAILED"; exit 1; } +[ -e simulator/build/fome_simulator.exe ] || [ -e simulator/build/fome_simulator ] || { echo "SIMULATOR COMPILATION FAILED"; exit 1; } diff --git a/misc/jenkins/build_working_folder.sh b/misc/jenkins/build_working_folder.sh index 5e43254435..31a77f5803 100755 --- a/misc/jenkins/build_working_folder.sh +++ b/misc/jenkins/build_working_folder.sh @@ -48,7 +48,7 @@ fi cp java_console_binary/rusefi_autoupdate.jar $CONSOLE_FOLDER cp java_console_binary/rusefi_console.jar $CONSOLE_FOLDER -# cp simulator/build/rusefi_simulator.exe $CONSOLE_FOLDER +# cp simulator/build/fome_simulator.exe $CONSOLE_FOLDER cp misc/console_launcher/rusefi_*.exe $CONSOLE_FOLDER cp java_console/*.dll $CONSOLE_FOLDER cp java_console/rusefi.xml $CONSOLE_FOLDER diff --git a/simulator/Makefile b/simulator/Makefile index 30dd557c4c..db94020164 100644 --- a/simulator/Makefile +++ b/simulator/Makefile @@ -121,9 +121,9 @@ endif # Define project name here ifeq ($(OS),Windows_NT) - PROJECT = rusefi_simulator.exe + PROJECT = fome_simulator.exe else - PROJECT = rusefi_simulator + PROJECT = fome_simulator endif PROJECT_DIR = ../firmware diff --git a/simulator/compile.sh b/simulator/compile.sh index c0e73b8d53..7e0449a28b 100755 --- a/simulator/compile.sh +++ b/simulator/compile.sh @@ -2,8 +2,8 @@ set -e -rm -f build/rusefi_simulator.exe +rm -f build/fome_simulator.exe make -j6 -r $@ [ $? -eq 0 ] || { echo "Simulator compilation failed"; exit 1; } -file build/rusefi_simulator +file build/fome_simulator echo "TIMESTAMP $(date "+%D %T.%2N") just compiled rusEFI simulator"