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

rename simulator

This commit is contained in:
Matthew Kennedy 2023-03-15 22:26:49 -07:00
parent c72afae1d1
commit 5c7334f2e7
10 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build-simulator.yaml vendored
View File

@ -44,10 +44,10 @@ jobs:
- name: Run Linux Simulator for 10 seconds - name: Run Linux Simulator for 10 seconds
working-directory: ./simulator/ working-directory: ./simulator/
run: ./build/rusefi_simulator 10 run: ./build/fome_simulator 10
# - name: Upload Linux built simulator # - name: Upload Linux built simulator
# uses: actions/upload-artifact@v3 # uses: actions/upload-artifact@v3
# with: # with:
# name: rusefi_simulator_linux # name: fome_simulator_linux
# path: ./simulator/build/rusefi_simulator # path: ./simulator/build/fome_simulator

4
.gitignore vendored
View File

@ -29,5 +29,5 @@ gitversion.h.gen
# Eclipse # Eclipse
.metadata/ .metadata/
# rusEFI simulator makes logs, ignore those # FOME simulator makes logs, ignore those
rusefi_simulator_log.mlg fome_simulator_log.mlg

2
.vscode/launch.json vendored
View File

@ -28,7 +28,7 @@
"name": "Debug simulator (gdb)", "name": "Debug simulator (gdb)",
"type": "cppdbg", "type": "cppdbg",
"request": "launch", "request": "launch",
"program": "${workspaceFolder}/simulator/build/rusefi_simulator", "program": "${workspaceFolder}/simulator/build/fome_simulator",
"stopAtEntry": false, "stopAtEntry": false,
"cwd": "${workspaceFolder}/simulator/", "cwd": "${workspaceFolder}/simulator/",
"environment": [], "environment": [],

2
firmware/hw_layer/mmc_card.cpp
View File

@ -491,7 +491,7 @@ public:
bool failed = false; bool failed = false;
SdLogBufferWriter() 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; fs_ready = true;
} }

2
java_console/autotest/src/main/java/com/rusefi/SimulatorExecHelper.java
View File

@ -14,7 +14,7 @@ public class SimulatorExecHelper {
private final static NamedThreadFactory THREAD_FACTORY = new NamedThreadFactory("SimulatorExecHelper", true); private final static NamedThreadFactory THREAD_FACTORY = new NamedThreadFactory("SimulatorExecHelper", true);
// see also SimulatorHelper // 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; static Process simulatorProcess;
/** /**

2
java_console/ui/src/main/java/com/rusefi/SimulatorHelper.java
View File

@ -14,7 +14,7 @@ import static com.rusefi.ui.util.UiUtils.setToolTip;
public class SimulatorHelper { public class SimulatorHelper {
private final static ThreadFactory THREAD_FACTORY = new NamedThreadFactory("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; private static Process process;
public static boolean isBinaryHere() { public static boolean isBinaryHere() {

2
misc/jenkins/build_simulator.sh
View File

@ -11,4 +11,4 @@ rm -rf .dep
bash compile.sh bash compile.sh
ls build ls build
cd .. 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; }

2
misc/jenkins/build_working_folder.sh
View File

@ -48,7 +48,7 @@ fi
cp java_console_binary/rusefi_autoupdate.jar $CONSOLE_FOLDER cp java_console_binary/rusefi_autoupdate.jar $CONSOLE_FOLDER
cp java_console_binary/rusefi_console.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 misc/console_launcher/rusefi_*.exe $CONSOLE_FOLDER
cp java_console/*.dll $CONSOLE_FOLDER cp java_console/*.dll $CONSOLE_FOLDER
cp java_console/rusefi.xml $CONSOLE_FOLDER cp java_console/rusefi.xml $CONSOLE_FOLDER

4
simulator/Makefile
View File

@ -121,9 +121,9 @@ endif
# Define project name here # Define project name here
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
PROJECT = rusefi_simulator.exe PROJECT = fome_simulator.exe
else else
PROJECT = rusefi_simulator PROJECT = fome_simulator
endif endif
PROJECT_DIR = ../firmware PROJECT_DIR = ../firmware

4
simulator/compile.sh
View File

@ -2,8 +2,8 @@
set -e set -e
rm -f build/rusefi_simulator.exe rm -f build/fome_simulator.exe
make -j6 -r $@ make -j6 -r $@
[ $? -eq 0 ] || { echo "Simulator compilation failed"; exit 1; } [ $? -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" echo "TIMESTAMP $(date "+%D %T.%2N") just compiled rusEFI simulator"