From e0bb7ad5811c3966d9755bbe5b8dc7d88d3c6ecf Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Tue, 20 Oct 2020 19:24:32 -0700 Subject: [PATCH] disable i2c, other unused features (#1891) * dead * more --- firmware/bootloader/src/Makefile | 2 +- .../config/boards/hellen/cypress/halconf.h | 2 +- firmware/config/boards/kinetis/halconf.h | 2 +- firmware/config/boards/prometheus/halconf.h | 3 -- firmware/config/stm32f4ems/halconf.h | 6 +-- firmware/config/stm32f7ems/halconf.h | 4 +- firmware/hw_layer/hardware.cpp | 39 ------------------- firmware/hw_layer/lcd/lcd_HD44780.cpp | 12 ------ simulator/halconf.h | 2 +- 9 files changed, 9 insertions(+), 63 deletions(-) diff --git a/firmware/bootloader/src/Makefile b/firmware/bootloader/src/Makefile index 1e18d2b357..2838e3aab6 100644 --- a/firmware/bootloader/src/Makefile +++ b/firmware/bootloader/src/Makefile @@ -17,7 +17,7 @@ ifeq ($(CONFDIR),) endif # disable some modules to shrink bootloader binary -DDEFS += -DHAL_USE_ADC=FALSE -DHAL_USE_CAN=FALSE -DHAL_USE_EXT=FALSE -DHAL_USE_GPT=FALSE -DHAL_USE_I2C=FALSE -DHAL_USE_ICU=FALSE -DHAL_USE_PWM=FALSE -DHAL_USE_RTC=FALSE -DHAL_USE_I2C=FALSE +DDEFS += -DHAL_USE_ADC=FALSE -DHAL_USE_CAN=FALSE -DHAL_USE_EXT=FALSE -DHAL_USE_GPT=FALSE -DHAL_USE_ICU=FALSE -DHAL_USE_PWM=FALSE -DHAL_USE_RTC=FALSE #disable ChibiOS flsah driver and prevent header from include DDEFS += -DHAL_USE_FLASH=FALSE diff --git a/firmware/config/boards/hellen/cypress/halconf.h b/firmware/config/boards/hellen/cypress/halconf.h index 8f1e7bf936..d453b4d0d0 100644 --- a/firmware/config/boards/hellen/cypress/halconf.h +++ b/firmware/config/boards/hellen/cypress/halconf.h @@ -229,7 +229,7 @@ * @brief Sleep mode related APIs inclusion switch. */ #if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__) -#define CAN_USE_SLEEP_MODE FALSE /* TRUE */ +#define CAN_USE_SLEEP_MODE FALSE #endif /*===========================================================================*/ diff --git a/firmware/config/boards/kinetis/halconf.h b/firmware/config/boards/kinetis/halconf.h index 8030635316..e035a0f19c 100644 --- a/firmware/config/boards/kinetis/halconf.h +++ b/firmware/config/boards/kinetis/halconf.h @@ -232,7 +232,7 @@ * @brief Sleep mode related APIs inclusion switch. */ #if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__) -#define CAN_USE_SLEEP_MODE TRUE +#define CAN_USE_SLEEP_MODE FALSE #endif /*===========================================================================*/ diff --git a/firmware/config/boards/prometheus/halconf.h b/firmware/config/boards/prometheus/halconf.h index e4e1ead174..1dab4e09fa 100644 --- a/firmware/config/boards/prometheus/halconf.h +++ b/firmware/config/boards/prometheus/halconf.h @@ -14,9 +14,6 @@ #ifndef _HALCONF_PROMETHEUS_H_ #define _HALCONF_PROMETHEUS_H_ -#undef HAL_USE_I2C -#define HAL_USE_I2C FALSE - #undef HAL_USE_SERIAL_USB #define HAL_USE_SERIAL_USB FALSE diff --git a/firmware/config/stm32f4ems/halconf.h b/firmware/config/stm32f4ems/halconf.h index de9e5527df..d24a2afaa8 100644 --- a/firmware/config/stm32f4ems/halconf.h +++ b/firmware/config/stm32f4ems/halconf.h @@ -99,7 +99,7 @@ * @brief Enables the I2C subsystem. */ #if !defined(HAL_USE_I2C) || defined(__DOXYGEN__) -#define HAL_USE_I2C TRUE +#define HAL_USE_I2C FALSE #endif /** @@ -226,7 +226,7 @@ * @brief Sleep mode related APIs inclusion switch. */ #if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__) -#define CAN_USE_SLEEP_MODE TRUE +#define CAN_USE_SLEEP_MODE FALSE #endif /*===========================================================================*/ @@ -406,7 +406,7 @@ * @note Disabling this option saves both code and data space. */ #if !defined(USB_USE_WAIT) || defined(__DOXYGEN__) -#define USB_USE_WAIT TRUE +#define USB_USE_WAIT FALSE #endif #include "halconf_community.h" diff --git a/firmware/config/stm32f7ems/halconf.h b/firmware/config/stm32f7ems/halconf.h index 15247a3204..cbf55bca07 100644 --- a/firmware/config/stm32f7ems/halconf.h +++ b/firmware/config/stm32f7ems/halconf.h @@ -90,7 +90,7 @@ * @brief Enables the I2C subsystem. */ #if !defined(HAL_USE_I2C) || defined(__DOXYGEN__) -#define HAL_USE_I2C TRUE +#define HAL_USE_I2C FALSE #endif /** @@ -224,7 +224,7 @@ * @brief Sleep mode related APIs inclusion switch. */ #if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__) -#define CAN_USE_SLEEP_MODE TRUE +#define CAN_USE_SLEEP_MODE FALSE #endif /*===========================================================================*/ diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp index 4b145d8760..0dcc2a1508 100644 --- a/firmware/hw_layer/hardware.cpp +++ b/firmware/hw_layer/hardware.cpp @@ -143,28 +143,6 @@ SPIDriver * getSpiDevice(spi_device_e spiDevice) { } #endif -#if HAL_USE_I2C -#if defined(STM32F7XX) -// values calculated with STM32CubeMX tool, 100kHz I2C clock for Nucleo-767 @168 MHz, PCK1=42MHz -#define HAL_I2C_F7_100_TIMINGR 0x00A0A3F7 -static I2CConfig i2cfg = { HAL_I2C_F7_100_TIMINGR, 0, 0 }; // todo: does it work? -#else /* defined(STM32F4XX) */ -static I2CConfig i2cfg = { OPMODE_I2C, 100000, STD_DUTY_CYCLE, }; -#endif /* defined(STM32F4XX) */ - -//static char txbuf[1]; - -static void sendI2Cbyte(int addr, int data) { - (void)addr; - (void)data; -// i2cAcquireBus(&I2CD1); -// txbuf[0] = data; -// i2cMasterTransmit(&I2CD1, addr, txbuf, 1, NULL, 0); -// i2cReleaseBus(&I2CD1); -} - -#endif - static Logging *sharedLogger; #if EFI_PROD_CODE @@ -618,27 +596,10 @@ void initHardware(Logging *l) { initAdcDriver(); #endif -#if HAL_USE_I2C - addConsoleActionII("i2c", sendI2Cbyte); -#endif - #if EFI_AUX_SERIAL initAuxSerial(); #endif /* EFI_AUX_SERIAL */ -// USBMassStorageDriver UMSD1; - -// while (true) { -// for (int addr = 0x20; addr < 0x28; addr++) { -// sendI2Cbyte(addr, 0); -// int err = i2cGetErrors(&I2CD1); -// print("I2C: err=%x from %d\r\n", err, addr); -// chThdSleepMilliseconds(5); -// sendI2Cbyte(addr, 255); -// chThdSleepMilliseconds(5); -// } -// } - #if EFI_VEHICLE_SPEED initVehicleSpeed(sharedLogger); #endif diff --git a/firmware/hw_layer/lcd/lcd_HD44780.cpp b/firmware/hw_layer/lcd/lcd_HD44780.cpp index 1bf0129b45..70e369cabe 100644 --- a/firmware/hw_layer/lcd/lcd_HD44780.cpp +++ b/firmware/hw_layer/lcd/lcd_HD44780.cpp @@ -106,19 +106,7 @@ static void lcd_HD44780_write(uint8_t data) { // LCD Pin RW -> P1 // LCD Pin E -> P2 -#if HAL_USE_I2C // todo: finish all this stuff - i2cAcquireBus(&I2CD1); -// -// txbuf[0] = 4; -// i2cMasterTransmit(&I2CD1, LCD_PORT_EXP_ADDR, txbuf, 1, NULL, 0); -// lcdSleep(10); // enable pulse must be >450ns -// -// txbuf[0] = 0; -// i2cMasterTransmit(&I2CD1, LCD_PORT_EXP_ADDR, txbuf, 1, NULL, 0); -// - i2cReleaseBus(&I2CD1); -#endif /* HAL_USE_I2C */ } } diff --git a/simulator/halconf.h b/simulator/halconf.h index 4d173633b9..312a2f85a0 100644 --- a/simulator/halconf.h +++ b/simulator/halconf.h @@ -212,7 +212,7 @@ * @brief Sleep mode related APIs inclusion switch. */ #if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__) -#define CAN_USE_SLEEP_MODE TRUE +#define CAN_USE_SLEEP_MODE FALSE #endif /*===========================================================================*/