hueso/bagdewitch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

input: move battery ADC call to timer call

Browse Source
This commit is contained in:
Puck Meerburg
2026-02-06 17:51:16 +00:00
parent 88126c31b7
commit 54e09bc059
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/button.c → src/input.c
View File

@@ -5,9 +5,13 @@
#include "CH58x_sys.h" #include "CH58x_sys.h"
#include "CH58xBLE_LIB.h" #include "CH58xBLE_LIB.h"
#include "platform.h"
volatile int button_count[2] = {15, 0}; uint16_t last_battery_value[24] = {0};
volatile int button_pressed[2] = {1, 0}; uint16_t last_battery_index = 0;
volatile int button_count[BUTTON_COUNT] = {15, 0};
volatile int button_pressed[BUTTON_COUNT] = {1, 0};
static void handle_button(int i, int state) { static void handle_button(int i, int state) {
if (state && button_count[i] < 16) button_count[i]++; if (state && button_count[i] < 16) button_count[i]++;
@@ -20,10 +24,14 @@ static void handle_button(int i, int state) {
__INTERRUPT __INTERRUPT
__HIGH_CODE __HIGH_CODE
void TMR3_IRQHandler(void) { void TMR3_IRQHandler(void) {
TMR3_ClearITFlag(TMR0_3_IT_CYC_END);
handle_button(0, !!GPIOA_ReadPortPin(GPIO_Pin_1)); handle_button(0, !!GPIOA_ReadPortPin(GPIO_Pin_1));
handle_button(1, !GPIOB_ReadPortPin(GPIO_Pin_22)); handle_button(1, !GPIOB_ReadPortPin(GPIO_Pin_22));
TMR3_ClearITFlag(TMR0_3_IT_CYC_END); ADC_ChannelCfg(1);
last_battery_value[last_battery_index++] = ADC_ExcutSingleConver();
if (last_battery_index >= 24) last_battery_index = 0;
} }
void button_init(void) void button_init(void)
@@ -52,7 +60,7 @@ int get_battery_percentage(void) {
uint32_t adc = 0; uint32_t adc = 0;
for (int i = 0; i < 24; i++) { for (int i = 0; i < 24; i++) {
adc += ADC_ExcutSingleConver(); adc += last_battery_value[i];
} }
adc /= 24; adc /= 24;

4
src/button.h → src/input.h
View File

@@ -1,7 +1,9 @@
#pragma once #pragma once
#include "platform.h"
void button_init(void); void button_init(void);
extern volatile int button_pressed[2]; extern volatile int button_pressed[BUTTON_COUNT];
int get_battery_percentage(void); int get_battery_percentage(void);
int is_charging(void); int is_charging(void);

2
src/main.c
View File

@@ -6,7 +6,7 @@
#include "CH58xBLE_LIB.h" #include "CH58xBLE_LIB.h"
#include "usb/core.h" #include "usb/core.h"
#include "led.h" #include "led.h"
#include "button.h" #include "input.h"
#include "menu.h" #include "menu.h"
#include "ble.h" #include "ble.h"
#include "cdc.h" #include "cdc.h"

2
src/menu.c
View File

@@ -7,7 +7,7 @@
#include "usb/core.h" #include "usb/core.h"
#include "led.h" #include "led.h"
#include "ble.h" #include "ble.h"
#include "button.h" #include "input.h"
#include "wang.h" #include "wang.h"
#include "img/menu.xbm" #include "img/menu.xbm"