From 593be1c94333b338305753faf3eaef3a122695da Mon Sep 17 00:00:00 2001 From: shadowm60 Date: Sun, 13 Dec 2020 03:03:52 +0200 Subject: [PATCH] Fsio eval check (#2068) * FSIO error signaling - wrong keyword in FSIO now shows up as nice TS error message - added f7 debug option for vsCode as well. * Keep unit_test happy --- .vscode/launch.json | 13 +++++++++++++ firmware/controllers/core/fsio_core.cpp | 4 +++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index a29299bfb8..bb4d2d7d75 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -56,6 +56,19 @@ "svdFile": "${workspaceRoot}/firmware/ext/cmsis-svd/data/STMicro/STM32F427.svd", "servertype": "openocd", "configFiles": ["interface/stlink.cfg", "target/stm32f4x.cfg"], + "runToMain": true + }, + { + "name": "Debug F7x6", + "type": "cortex-debug", + "request": "launch", + "cwd": "${workspaceFolder}", + "executable": "${workspaceRoot}/firmware/build/rusefi.elf", + "device": "STM32F767V", + "v1": false, + "svdFile": "${workspaceRoot}/firmware/ext/cmsis-svd/data/STMicro/STM32F7x6.svd", + "servertype": "openocd", + "configFiles": ["board/stm32f7discovery.cfg"], "runToMain": true } ] diff --git a/firmware/controllers/core/fsio_core.cpp b/firmware/controllers/core/fsio_core.cpp index f5b5e92a7b..60c6d9a889 100644 --- a/firmware/controllers/core/fsio_core.cpp +++ b/firmware/controllers/core/fsio_core.cpp @@ -422,7 +422,9 @@ LEElement *LEElementPool::parseExpression(const char * line) { /** * Cannot recognize token */ - warning(CUSTOM_ERR_PARSING_ERROR, "unrecognized [%s]", parsingBuffer); +#if ! EFI_UNIT_TEST + firmwareError(CUSTOM_ERR_PARSING_ERROR, "unrecognized FSIO keyword [%s]", parsingBuffer); +#endif return nullptr; } n->init(action);