From f11e52a402c62e1c7513b91bdc7816bbd875dbb5 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Tue, 19 Dec 2023 13:50:27 -0500 Subject: [PATCH] only: pulling most useful fields up --- firmware/config/engines/custom_engine.cpp | 2 +- firmware/hw_layer/drivers/gpio/gpio_ext.h | 5 +++++ firmware/hw_layer/drivers/gpio/l9779.cpp | 5 +---- firmware/hw_layer/drivers/gpio/tle8888.cpp | 6 +----- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index 03d33e2d3d..138d3a9451 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -880,7 +880,7 @@ end function onTick() local targetVoltage = getAuxAnalog(0) - + -- local target = interpolate(1, 0, 3.5, 100, targetVoltage) local target = interpolate(1, 0, 3.5, 100, voltageFromCan) -- clamp 0 to 100 diff --git a/firmware/hw_layer/drivers/gpio/gpio_ext.h b/firmware/hw_layer/drivers/gpio/gpio_ext.h index a4af66276f..1bae349e7b 100644 --- a/firmware/hw_layer/drivers/gpio/gpio_ext.h +++ b/firmware/hw_layer/drivers/gpio/gpio_ext.h @@ -29,6 +29,11 @@ struct GpioChip { virtual int readPad(size_t /*pin*/) { return -1; } virtual brain_pin_diag_e getDiag(size_t /*pin*/) { return PIN_OK; } virtual int deinit() { return 0; } + + /* chip needs reinitialization due to some critical issue */ + bool need_init; + int init_cnt; + }; int gpiochips_getPinOffset(brain_pin_e pin); diff --git a/firmware/hw_layer/drivers/gpio/l9779.cpp b/firmware/hw_layer/drivers/gpio/l9779.cpp index 8fd970e8ad..bf05ce251d 100644 --- a/firmware/hw_layer/drivers/gpio/l9779.cpp +++ b/firmware/hw_layer/drivers/gpio/l9779.cpp @@ -158,14 +158,11 @@ struct L9779 : public GpioChip { /* last requested subaddr in case of read */ uint8_t last_subaddr; - /* chip needs reintialization due to some critical issue */ - bool need_init; /* statistic */ //int por_cnt; //int wdr_cnt; //int comfe_cnt; - int init_cnt; //int init_req_cnt; int spi_cnt; int spi_err_parity; /* parity errors in rx data */ @@ -548,7 +545,7 @@ static THD_FUNCTION(l9779_driver_thread, p) { chip->diag_ts = chTimeAddX(chVTGetSystemTimeX(), TIME_MS2I(DIAG_PERIOD_MS)); } - poll_interval = chip->calc_sleep_interval(); + poll_interval = chip->calc_sleep_interval(); #endif /* default poll_interval */ } diff --git a/firmware/hw_layer/drivers/gpio/tle8888.cpp b/firmware/hw_layer/drivers/gpio/tle8888.cpp index 7956f2ac5c..a6aeeb9821 100644 --- a/firmware/hw_layer/drivers/gpio/tle8888.cpp +++ b/firmware/hw_layer/drivers/gpio/tle8888.cpp @@ -248,9 +248,6 @@ struct Tle8888 : public GpioChip { systime_t wwd_ts; systime_t fwd_ts; - /* chip needs reintialization due to some critical issue */ - bool need_init; - /* main relay output */ bool mr_manual; @@ -258,7 +255,6 @@ struct Tle8888 : public GpioChip { int por_cnt; int wdr_cnt; int comfe_cnt; - int init_cnt; int init_req_cnt; int spi_cnt; uint16_t recentTx; @@ -660,7 +656,7 @@ int Tle8888::chip_init() * not to affect analog inputs. * Disable open load detection and set short to bat * thresholt to 125 mV (default) for OUTPUT8..13 */ - CMD_OUTCONFIG(2, (0x0 << 6) | 0x00), + CMD_OUTCONFIG(2, (0x0 << 6) | 0x00), #else /* Enable open load detection and set short to bat * thresholt to 125 mV (default) for OUTPUT8..13 */