From 2b49fc31eae6f44074cc5f8c7cad85148114c3c1 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Thu, 5 Dec 2019 21:04:24 -0500
Subject: [PATCH] steps towards fixing PAL inputs

---
 .github/workflows/build-firmware.yaml              | 10 +++++-----
 .../boards/frankenso/!compile-frankenso-pal.bat    | 14 ++++++++++++++
 firmware/hw_layer/digital_input_icu.cpp            |  2 +-
 3 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 firmware/config/boards/frankenso/!compile-frankenso-pal.bat

diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml
index fbf05faea2..01ab230b6e 100644
--- a/.github/workflows/build-firmware.yaml
+++ b/.github/workflows/build-firmware.yaml
@@ -24,7 +24,7 @@ jobs:
           - build-target: frankenso-pal
             efi-cpu: ARCH_STM32F4
             efi-board: st_stm32f4
-            extra-params: -DHAL_TRIGGER_USE_PAL=TRUE -DHAL_USE_ICU=FALSE
+            target-extra-params: -DHAL_TRIGGER_USE_PAL=TRUE -DHAL_USE_ICU=FALSE
             
           - build-target: mre-f4
             efi-cpu: ARCH_STM32F4
@@ -49,16 +49,16 @@ jobs:
           - build-target: kinetis
             efi-cpu: kinetis
             efi-board: kinetis
-            extra-extra-params: -DCPU_MKE16F512VLH16 -DCPU_MKE16F512VLH16_cm4 -D__USE_CMSI -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS
+            target-extra-params: -DCPU_MKE16F512VLH16 -DCPU_MKE16F512VLH16_cm4 -D__USE_CMSI -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS
             extra-options: USE_FATFS=no USE_BOOTLOADER=no
 
           # Debug vs. release configuration
           - build-type: debug
-            extra-params: -DDUMMY
+            type-extra-params: -DDUMMY
             build-debug-level-opt: -O0 -ggdb -g3
 
           - build-type: release
-            extra-params: -DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_TRACE=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE
+            type-extra-params: -DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_TRACE=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE
             build-debug-level-opt: -O2 -ggdb -g3
 
         exclude:
@@ -85,7 +85,7 @@ jobs:
     # Build the firmware!
     - name: Build Firmware
       working-directory: ./firmware/
-      run: make -j4 PROJECT_BOARD=${{matrix.efi-board}} PROJECT_CPU=${{matrix.efi-cpu}} EXTRA_PARAMS="${{matrix.extra-params}} ${{matrix.extra-extra-params}}" DEBUG_LEVEL_OPT='${{matrix.build-debug-level-opt}}' ${{matrix.extra-options}}
+      run: make -j4 PROJECT_BOARD=${{matrix.efi-board}} PROJECT_CPU=${{matrix.efi-cpu}} EXTRA_PARAMS="${{matrix.type-extra-params}} ${{matrix.target-extra-params}}" DEBUG_LEVEL_OPT='${{matrix.build-debug-level-opt}}' ${{matrix.extra-options}}
       
     # The next two steps upload the bin and elf as build artifacts
     - name: Upload elf
diff --git a/firmware/config/boards/frankenso/!compile-frankenso-pal.bat b/firmware/config/boards/frankenso/!compile-frankenso-pal.bat
new file mode 100644
index 0000000000..ed2d93cf77
--- /dev/null
+++ b/firmware/config/boards/frankenso/!compile-frankenso-pal.bat
@@ -0,0 +1,14 @@
+
+cd ../../..
+
+set EXTRA_PARAMS=-DDUMMY ^
+ -DHAL_TRIGGER_USE_PAL=TRUE ^
+ -DEFI_VEHICLE_SPEED=FALSE ^
+ -DHAL_USE_ICU=FALSE ^
+ -DEFI_LOGIC_ANALYZER=FALSE ^
+ -DHAL_USE_ICU=FALSE ^
+ -DDEFAULT_ENGINE_TYPE=MIATA_NA6_VAF ^
+ -DFIRMWARE_ID=\"frankensoNA6\"
+
+call config/boards/common_make.bat
+
diff --git a/firmware/hw_layer/digital_input_icu.cpp b/firmware/hw_layer/digital_input_icu.cpp
index 153ff58f00..028c8929ba 100644
--- a/firmware/hw_layer/digital_input_icu.cpp
+++ b/firmware/hw_layer/digital_input_icu.cpp
@@ -28,7 +28,7 @@
 
 #include "fl_stack.h"
 
-#if EFI_ICU_INPUTS
+#if EFI_ICU_INPUTS && HAL_USE_ICU
 
 #include "mpu_util.h"
 #include "eficonsole.h"