Skip to content
This repository was archived by the owner on Jun 23, 2023. It is now read-only.

Commit 7b2bde9

Browse files
committed
Added lights current ADC step configuration
1 parent 1e09de3 commit 7b2bde9

6 files changed

Lines changed: 267 additions & 254 deletions

File tree

firmware/common/include/eeprom.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ typedef struct eeprom_data {
147147

148148
uint8_t ui8_pedal_cadence_fast_stop;
149149
uint8_t ui8_coast_brake_adc;
150+
uint8_t ui8_adc_lights_current_offset;
150151

151152
// FIXME align to 32 bit value by end of structure and pack other fields
152153
} eeprom_data_t;
@@ -269,6 +270,7 @@ void eeprom_init_defaults(void);
269270
#define DEFAULT_PEDAL_CADENCE_FAST_STOP_ENABLE 1 // enabled
270271
#define DEFAULT_COAST_BRAKE_ADC 15 // 15: tested by plpetrov user on 28.04.2020:
271272
#define DEFAULT_FIELD_WEAKENING 1 // 1 enabled
273+
#define DEFAULT_ADC_LIGHTS_CURRENT_OFFSET 0
272274

273275
#define BICYCLE_1
274276
//#define BICYCLE_2

firmware/common/include/state.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,8 @@ typedef struct rt_vars_struct {
135135

136136
uint8_t ui8_pedal_cadence_fast_stop;
137137
uint8_t ui8_coast_brake_adc;
138+
uint8_t ui8_adc_lights_current_offset;
139+
uint16_t ui16_adc_battery_current;
138140

139141
battery_energy_h_km_t battery_energy_h_km;
140142
} rt_vars_t;
@@ -338,6 +340,8 @@ typedef struct ui_vars_struct {
338340

339341
uint8_t ui8_pedal_cadence_fast_stop;
340342
uint8_t ui8_coast_brake_adc;
343+
uint8_t ui8_adc_lights_current_offset;
344+
uint16_t ui16_adc_battery_current;
341345
} ui_vars_t;
342346

343347
ui_vars_t* get_ui_vars(void);

firmware/common/include/uart.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ const uint8_t* uart_get_rx_buffer_rdy(void);
77
uint8_t* uart_get_tx_buffer(void);
88
void uart_send_tx_buffer(uint8_t *tx_buffer, uint8_t ui8_len);
99

10-
#define UART_NUMBER_DATA_BYTES_TO_RECEIVE 28
11-
#define UART_NUMBER_DATA_BYTES_TO_SEND 85
10+
#define UART_NUMBER_DATA_BYTES_TO_RECEIVE 29
11+
#define UART_NUMBER_DATA_BYTES_TO_SEND 86
1212

firmware/common/src/configscreen.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,6 @@ static Field displayMenus[] =
180180
FIELD_EDITABLE_UINT(_S("Auto power off", "Auto p off"), &ui_vars.ui8_lcd_power_off_time_minutes, "mins", 0, 255),
181181
FIELD_EDITABLE_ENUM("Units", &ui_vars.ui8_units_type, "SI", "Imperial"),
182182
#ifndef SW102
183-
// FIELD_READONLY_STRING("Display firmware", ""),
184-
// FIELD_READONLY_STRING("TSDZ2 firmware", ""),
185183
FIELD_READONLY_ENUM("LCD type", &g_lcd_ic_type, "ILI9481", "ST7796", "unknown"),
186184
#endif
187185
FIELD_EDITABLE_ENUM(_S("Reset to defaults", "Reset def"), &ui8_g_configuration_display_reset_to_defaults, "no", "yes"),
@@ -190,6 +188,7 @@ static Field displayMenus[] =
190188
static Field variousMenus[] = {
191189
FIELD_EDITABLE_ENUM(_S("Cadence fast stop", "Cadenc stp"), &ui_vars.ui8_pedal_cadence_fast_stop, "no", "yes"),
192190
FIELD_EDITABLE_UINT(_S("Coast brake ADC", "Coa bk ADC"), &ui_vars.ui8_coast_brake_adc, "", 5, 255),
191+
FIELD_EDITABLE_UINT(_S("ADC lights offset", "ADC lights"), &ui_vars.ui8_adc_lights_current_offset, "", 0, 4),
193192
FIELD_EDITABLE_ENUM(_S("Assist w/o pedal rot", "A w/o ped"), &ui_vars.ui8_motor_assistance_startup_without_pedal_rotation, "disable", "enable"), // FIXME, share one array of disable/enable strings
194193
FIELD_EDITABLE_UINT("Odometer", &ui_vars.ui32_odometer_x10, "km", 0, UINT32_MAX, .div_digits = 1, .inc_step = 100, .onSetEditable = onSetConfigurationWheelOdometer),
195194
FIELD_END };
@@ -341,6 +340,7 @@ static Field variablesMenus[] = {
341340
#endif
342341

343342
static Field technicalMenus[] = {
343+
FIELD_READONLY_UINT(_S("ADC battery current", "ADC bat cu"), &ui_vars.ui16_adc_battery_current, ""),
344344
FIELD_READONLY_UINT(_S("ADC throttle sensor", "ADC thrott"), &ui_vars.ui8_adc_throttle, ""),
345345
FIELD_READONLY_UINT(_S("Throttle sensor", "Throttle s"), &ui_vars.ui8_throttle, ""),
346346
FIELD_READONLY_UINT(_S("ADC torque sensor", "ADC torque"), &ui_vars.ui16_adc_pedal_torque_sensor, ""),

0 commit comments

Comments
 (0)