Skip to content

Commit cb58d29

Browse files
committed
Fix battery mesure and add my config
1 parent 870a972 commit cb58d29

File tree

2 files changed

+40
-1
lines changed

2 files changed

+40
-1
lines changed

platformio.ini

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,3 +239,40 @@ build_flags =
239239
-D INVERT_L_DIRECTION=1
240240

241241
-D PHASE_ADV_ENA=0
242+
243+
[env:ezebot]
244+
; hoverboard sensor functionality is disabled
245+
; and control is via USART2
246+
platform = ststm32
247+
framework = stm32cube
248+
debug_tool = stlink
249+
board = genericSTM32F103RC
250+
251+
build_flags =
252+
-I${PROJECT_DIR}/inc/
253+
-I${PROJECT_DIR}/src/hbprotocol/
254+
-DUSE_HAL_DRIVER
255+
-DSTM32F103xE
256+
-Wl,-T${PROJECT_DIR}/STM32F103RCTx_FLASH.ld
257+
-Wl,-lc
258+
-Wl,-lm
259+
-Og
260+
# -Wl,-lnosys
261+
-D IGNORE_GLOBAL_CONFIG
262+
263+
-D SERIAL_USART2_IT
264+
-D USART2_BAUD=115200 ; UART baud rate
265+
-D USART2_WORDLENGTH=UART_WORDLENGTH_8B ; UART_WORDLENGTH_8B or UART_WORDLENGTH_9B
266+
-D SERIAL_USART_IT_BUFFERTYPE='unsigned char' ; char or short
267+
268+
-D FLASH_STORAGE
269+
-D HALL_INTERRUPTS
270+
271+
-D ENABLE_INACTIVITY_TIMEOUT=0
272+
-D BEEPS_ON_OFF=0
273+
274+
-D BAT_CALIB_REAL_VOLTAGE=40.4
275+
-D BAT_CALIB_ADC=1615
276+
-D BAT_LOW_LVL1=3.4
277+
-D BAT_LOW_LVL2=3.2
278+
-D BAT_LOW_DEAD=3.0

src/bldc.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,8 +406,10 @@ void readADCs() {
406406
// some parts of main use this directly.
407407
memcpy((void *)&adc_buffer, (void *)buf, sizeof(adc_buffer));
408408

409-
batteryVoltage = batteryVoltage * 0.99 + ((float)buf->batt1 * ((float)BAT_CALIB_REAL_VOLTAGE / (float)BAT_CALIB_ADC)) * 0.01;
409+
int rawBat = buf->batt1;
410+
batteryVoltage = batteryVoltage * 0.99 + ((float)rawBat * ((float)BAT_CALIB_REAL_VOLTAGE / (float)BAT_CALIB_ADC)) * 0.01;
410411
electrical_measurements.batteryVoltage = batteryVoltage;
412+
electrical_measurements.bat_raw = rawBat;
411413

412414
float dclAmps = (float)ABS(buf->dcl - adc_buffers.offsetdcl) * MOTOR_AMP_CONV_DC_AMP;
413415
electrical_measurements.motors[0].dcAmps = dclAmps;

0 commit comments

Comments
 (0)