Skip to content

Commit

Permalink
adjust low-batter shutoff voltage
Browse files Browse the repository at this point in the history
  • Loading branch information
@dekuNukem
dekuNukem committed Aug 23, 2020
1 parent fcd1cda commit ea04133
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 63 deletions.
Binary file modified firmware/TX_1.1.0.dfu
View file
Binary file not shown.
24 changes: 12 additions & 12 deletions firmware/tx/MDK-ARM/tx.uvguix.allen
View file

Large diffs are not rendered by default.

Binary file modified firmware/tx/MDK-ARM/tx/helpers.crf
View file
Binary file not shown.
Binary file modified firmware/tx/MDK-ARM/tx/helpers.o
View file
Binary file not shown.
Binary file modified firmware/tx/MDK-ARM/tx/main.crf
View file
Binary file not shown.
Binary file modified firmware/tx/MDK-ARM/tx/main.o
View file
Binary file not shown.
Binary file modified firmware/tx/MDK-ARM/tx/tx.axf
View file
Binary file not shown.
48 changes: 2 additions & 46 deletions firmware/tx/MDK-ARM/tx/tx.build_log.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,56 +26,12 @@ <h2>Project:</h2>

<h2>Output:</h2>
*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin'
Rebuild target 'tx'
assembling startup_stm32f042x6.s...
compiling animation.c...
compiling ee.c...
compiling radioPinFunctions.c...
compiling sleepybutton.c...
compiling my_usb.c...
compiling usb_device.c...
compiling nrf24.c...
compiling VL53L0X.c...
Build target 'tx'
compiling helpers.c...
..\Src\helpers.c(194): warning: #188-D: enumerated type mixed with another type
HAL_NVIC_DisableIRQ(i);
..\Src\helpers.c: 1 warning, 0 errors
compiling usbd_conf.c...
compiling main.c...
compiling stm32f0xx_hal_iwdg.c...
compiling stm32f0xx_hal_adc_ex.c...
compiling stm32f0xx_hal_i2c_ex.c...
compiling stm32f0xx_hal_msp.c...
compiling stm32f0xx_it.c...
compiling stm32f0xx_hal_pcd_ex.c...
compiling usbd_desc.c...
compiling usbd_cdc_if.c...
compiling stm32f0xx_hal_pcd.c...
compiling stm32f0xx_hal_adc.c...
compiling stm32f0xx_hal_i2c.c...
compiling stm32f0xx_hal_spi_ex.c...
compiling stm32f0xx_hal_rtc.c...
compiling stm32f0xx_hal_rtc_ex.c...
compiling stm32f0xx_hal_uart_ex.c...
compiling stm32f0xx_hal.c...
compiling stm32f0xx_hal_tim_ex.c...
compiling stm32f0xx_hal_rcc_ex.c...
compiling stm32f0xx_hal_uart.c...
compiling stm32f0xx_hal_spi.c...
compiling stm32f0xx_hal_rcc.c...
compiling stm32f0xx_hal_tim.c...
compiling stm32f0xx_hal_pwr.c...
compiling stm32f0xx_hal_cortex.c...
compiling stm32f0xx_hal_gpio.c...
compiling stm32f0xx_hal_pwr_ex.c...
compiling system_stm32f0xx.c...
compiling stm32f0xx_hal_flash.c...
compiling stm32f0xx_hal_dma.c...
compiling stm32f0xx_hal_flash_ex.c...
compiling usbd_core.c...
compiling usbd_ioreq.c...
compiling usbd_ctlreq.c...
compiling usbd_cdc.c...
linking...
Program Size: Code=30392 RO-data=516 RW-data=496 ZI-data=4832
FromELF: creating hex file...
Expand All @@ -102,7 +58,7 @@ <h2>Collection of Component include folders:</h2>
<h2>Collection of Component Files used:</h2>

* Component: ARM::CMSIS:CORE:5.3.0
Build Time Elapsed: 00:00:29
Build Time Elapsed: 00:00:02
</pre>
</body>
</html>
2 changes: 1 addition & 1 deletion firmware/tx/MDK-ARM/tx/tx.hex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1538,7 +1538,7 @@
:10600000DC05000010B504462A48FAF72BFFFF21F3
:10601000F5312848FAF7C6FE2648FAF7D1FD1A21CD
:10602000484320802348FAF74BFF208822498842C2
:106030003FD222A0FFF73CFE032001F02BFA1E48BE
:106030003FD822A0FFF73CFE032001F02BFA1E48B8
:10604000FA38FAF75CFF002001F024FA01F052FA66
:1060500000F05EFE0924E406002210212046FBF732
:106060000EF9012202211D48FBF709F90122114610
Expand Down
2 changes: 1 addition & 1 deletion firmware/tx/MDK-ARM/tx/tx.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<title>Static Call Graph - [tx\tx.axf]</title></head>
<body><HR>
<H1>Static Call Graph for image tx\tx.axf</H1><HR>
<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060750: Last Updated: Sat Aug 22 22:35:14 2020
<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060750: Last Updated: Sun Aug 23 14:32:31 2020
<BR><P>
<H3>Maximum Stack Usage = 272 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
Call chain for Maximum Stack Depth:</H3>
Expand Down
4 changes: 2 additions & 2 deletions firmware/tx/MDK-ARM/tx/tx_tx.dep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ I (../Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_hal_uart.h)(0x5F0721C3)
I (../Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_hal_uart_ex.h)(0x5F0721C3)
I (../Inc/shared.h)(0x5DA30397)
F (..\Inc\helpers.h)(0x5F3D4094)()
F (..\Src\helpers.c)(0x5F3F23FB)(--c99 -c --cpu Cortex-M0 -D__MICROLIB -g -O3 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32F0xx_HAL_Driver/Inc -I ../Drivers/STM32F0xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F0xx/Include -I ../Drivers/CMSIS/Include -I ../Middlewares/ST/STM32_USB_Device_Library/Core/Inc -I ../Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc-I.\RTE\_tx-IC:\Users\allen\AppData\Local\Arm\Packs\ARM\CMSIS\5.6.0\CMSIS\Core\Include-IC:\Users\allen\AppData\Local\Arm\Packs\Keil\STM32F0xx_DFP\2.0.0\Drivers\CMSIS\Device\ST\STM32F0xx\Include-D__UVISION_VERSION="529" -D_RTE_ -DSTM32F042x6 -DUSE_HAL_DRIVER -DSTM32F042x6-o tx\helpers.o --omf_browse tx\helpers.crf --depend tx\helpers.d)
F (..\Src\helpers.c)(0x5F426FDE)(--c99 -c --cpu Cortex-M0 -D__MICROLIB -g -O3 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32F0xx_HAL_Driver/Inc -I ../Drivers/STM32F0xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F0xx/Include -I ../Drivers/CMSIS/Include -I ../Middlewares/ST/STM32_USB_Device_Library/Core/Inc -I ../Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc-I.\RTE\_tx-IC:\Users\allen\AppData\Local\Arm\Packs\ARM\CMSIS\5.6.0\CMSIS\Core\Include-IC:\Users\allen\AppData\Local\Arm\Packs\Keil\STM32F0xx_DFP\2.0.0\Drivers\CMSIS\Device\ST\STM32F0xx\Include-D__UVISION_VERSION="529" -D_RTE_ -DSTM32F042x6 -DUSE_HAL_DRIVER -DSTM32F042x6-o tx\helpers.o --omf_browse tx\helpers.crf --depend tx\helpers.d)
I (C:\Keil_v5\ARM\ARMCC\include\stdio.h)(0x5D9B429A)
I (C:\Keil_v5\ARM\ARMCC\include\string.h)(0x5D9B4298)
I (C:\Keil_v5\ARM\ARMCC\include\stdlib.h)(0x5D9B429A)
Expand Down Expand Up @@ -371,7 +371,7 @@ I (../Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_def.h)(0x5F0721C4)
I (../Inc/usbd_conf.h)(0x5F0721C3)
I (../Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_core.h)(0x5F0721C4)
I (../Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ctlreq.h)(0x5F0721C4)
F (../Src/main.c)(0x5F3F23BE)(--c99 -c --cpu Cortex-M0 -D__MICROLIB -g -O3 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32F0xx_HAL_Driver/Inc -I ../Drivers/STM32F0xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F0xx/Include -I ../Drivers/CMSIS/Include -I ../Middlewares/ST/STM32_USB_Device_Library/Core/Inc -I ../Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc-I.\RTE\_tx-IC:\Users\allen\AppData\Local\Arm\Packs\ARM\CMSIS\5.6.0\CMSIS\Core\Include-IC:\Users\allen\AppData\Local\Arm\Packs\Keil\STM32F0xx_DFP\2.0.0\Drivers\CMSIS\Device\ST\STM32F0xx\Include-D__UVISION_VERSION="529" -D_RTE_ -DSTM32F042x6 -DUSE_HAL_DRIVER -DSTM32F042x6-o tx\main.o --omf_browse tx\main.crf --depend tx\main.d)
F (../Src/main.c)(0x5F426FEA)(--c99 -c --cpu Cortex-M0 -D__MICROLIB -g -O3 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32F0xx_HAL_Driver/Inc -I ../Drivers/STM32F0xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F0xx/Include -I ../Drivers/CMSIS/Include -I ../Middlewares/ST/STM32_USB_Device_Library/Core/Inc -I ../Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc-I.\RTE\_tx-IC:\Users\allen\AppData\Local\Arm\Packs\ARM\CMSIS\5.6.0\CMSIS\Core\Include-IC:\Users\allen\AppData\Local\Arm\Packs\Keil\STM32F0xx_DFP\2.0.0\Drivers\CMSIS\Device\ST\STM32F0xx\Include-D__UVISION_VERSION="529" -D_RTE_ -DSTM32F042x6 -DUSE_HAL_DRIVER -DSTM32F042x6-o tx\main.o --omf_browse tx\main.crf --depend tx\main.d)
I (../Inc/main.h)(0x5F0721C3)
I (../Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_hal.h)(0x5F0721C3)
I (../Inc/stm32f0xx_hal_conf.h)(0x5F0721C3)
Expand Down
2 changes: 1 addition & 1 deletion firmware/tx/Src/helpers.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ void check_battery(uint16_t* vbat_mV)
// return;

// if(*vbat_mV >= 2500 && *vbat_mV <= 3250)
if(*vbat_mV < 3250) // 3200 after diode drop is about 3.5V
if(*vbat_mV <= 3250) // 3250 after diode drop is about 3.53V
{
printf("low battery, shutting down...\n");
start_animation(ANIMATION_TYPE_FASTBLINK);
Expand Down

0 comments on commit ea04133

Please sign in to comment.