From 853289feaff9f47113354c9158af36800595fcd1 Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 28 Aug 2017 20:42:27 -0400 Subject: [PATCH] #473 --- firmware/Makefile | 1 + firmware/hw_layer/accelerometer.cpp | 10 +++------- firmware/hw_layer/hardware.cpp | 3 +++ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/firmware/Makefile b/firmware/Makefile index f96f2278ec..4c07383230 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -160,6 +160,7 @@ CSRC = $(STARTUPSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ $(BOOTLOADERSRC) \ + $(CHIBIOS)/os/various/devices_lib/accel/lis302dl.c \ $(CHIBIOS)/os/various/syscalls.c \ $(CHIBIOS)/os/hal/lib/streams/memstreams.c \ $(CHIBIOS)/os/hal/lib/streams/chprintf.c \ diff --git a/firmware/hw_layer/accelerometer.cpp b/firmware/hw_layer/accelerometer.cpp index d194c1ef00..a2eec862d0 100644 --- a/firmware/hw_layer/accelerometer.cpp +++ b/firmware/hw_layer/accelerometer.cpp @@ -55,11 +55,11 @@ void configureAccelerometerPins(DECLARE_ENGINE_PARAMETER_SIGNATURE) { #if EFI_MEMS || defined(__DOXYGEN__) void accelerometerPeriodicCallback(DECLARE_ENGINE_PARAMETER_SIGNATURE) { -// int8_t x = (int8_t)lis302dlReadRegister(driver, LIS302DL_OUTX); -// int8_t y = (int8_t)lis302dlReadRegister(driver, LIS302DL_OUTY); + int8_t x = (int8_t)lis302dlReadRegister(driver, LIS302DL_OUTX); + int8_t y = (int8_t)lis302dlReadRegister(driver, LIS302DL_OUTY); } -void initMems(DECLARE_ENGINE_PARAMETER_SIGNATURE) { +void initAccelerometer(DECLARE_ENGINE_PARAMETER_SIGNATURE) { if (engineConfiguration->LIS302DLCsPin == GPIOA_0) return; // temporary code to handle old configurations if (engineConfiguration->LIS302DLCsPin == GPIO_UNASSIGNED) @@ -88,10 +88,6 @@ void initMems(DECLARE_ENGINE_PARAMETER_SIGNATURE) { -void initAccelerometer(DECLARE_ENGINE_PARAMETER_SIGNATURE) { - -} - float getLongitudinalAcceleration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { return 0; } diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp index 1a9ad26451..d3da3a1ef1 100644 --- a/firmware/hw_layer/hardware.cpp +++ b/firmware/hw_layer/hardware.cpp @@ -22,6 +22,7 @@ #include "eficonsole.h" #include "max31855.h" #include "mpu_util.h" +#include "accelerometer.h" #if EFI_PROD_CODE //#include "usb_msd.h" @@ -412,6 +413,8 @@ void initHardware(Logging *l) { initMmcCard(); #endif /* EFI_FILE_LOGGING */ + + initAccelerometer(PASS_ENGINE_PARAMETER_SIGNATURE); // initFixedLeds(); // initBooleanInputs();