Skip to content

Make tmo_shell ADC activity defer to external. #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 1, 2023
Merged

Make tmo_shell ADC activity defer to external. #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions samples/tmo_shell/src/tmo_adc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ K_SEM_DEFINE(adc_sem, 0, 1);
static ADC_InitSingle_TypeDef initSingle_bv = ADC_INITSINGLE_DEFAULT;
static ADC_InitSingle_TypeDef initSingle_hwid = ADC_INITSINGLE_DEFAULT;

#ifdef HWID_APORT
/**
* @brief Set the VBAT_SNS_EN Pin High to enable ADC readings
*
Expand All @@ -40,14 +39,19 @@ static void set_vbat_sens_en(bool enable)
GPIO_PinModeSet(VBAT_EN_PORT, VBAT_EN_PIN, gpioModePushPull, enable);
#endif /* VBAT_EN_PORT */
}
#endif /* HWID_APORT */

/**
* @brief Initialize the Gecko ADC
*
*/
void initADC(void)
static void initADC(void)
{
static bool lazy_init = false; /* perform the init only once */
/* use lazy init, to remove the call from tmo_shell.c */
if (lazy_init) {
return;
}
lazy_init = true;

// Enable ADC0 clock
CMU_ClockEnable(cmuClock_ADC0, true);
Expand Down Expand Up @@ -77,18 +81,14 @@ void initADC(void)
init.timebase = ADC_TimebaseCalc(0);

ADC_Init(ADC0, &init);

int hwid = read_hwid();

LOG_INF("HWID = %d\n", hwid);
}

/*
* @brief This function writes the amount of battery charge remaining
* (to the nearest 1%) in bv.
* It returns true if successful, or false if there is an issue
*/
bool millivolts_to_percent(uint32_t millivolts, uint8_t *percent) {
__weak bool millivolts_to_percent(uint32_t millivolts, uint8_t *percent) {
float curBv = get_remaining_capacity((float) millivolts / 1000);
*percent = (uint8_t) (curBv + 0.5);
return true;
Expand All @@ -97,9 +97,11 @@ bool millivolts_to_percent(uint32_t millivolts, uint8_t *percent) {
/**
* @brief Main function
*/
int read_battery_voltage(void)
__weak int read_battery_voltage(void)
{
#ifdef VBAT_APORT
initADC();

uint32_t sample;
uint32_t millivolts;
float millivolts_f;
Expand Down Expand Up @@ -140,9 +142,11 @@ int read_battery_voltage(void)
*
* @return int Millivolts
*/
int read_hwid(void)
__weak int read_hwid(void)
{
#ifdef HWID_APORT
initADC();

uint32_t sample;
uint32_t millivolts;
float millivolts_f;
Expand Down
1 change: 0 additions & 1 deletion samples/tmo_shell/src/tmo_adc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@
int read_battery_voltage(void);
int read_hwid(void);
bool millivolts_to_percent(uint32_t millivolts, uint8_t *bv);
void initADC();

#endif
1 change: 0 additions & 1 deletion samples/tmo_shell/src/tmo_shell.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3049,7 +3049,6 @@ void tmo_shell_main(void)
mountfs();

cxd5605_init();
initADC();
#ifdef CONFIG_WIFI
tmo_wifi_connect();
#endif
Expand Down