updates for merge

This commit is contained in:
Jason Kotzin 2022-08-10 20:30:57 -07:00
parent 4f97627b02
commit 878dc379b9

View File

@ -236,6 +236,16 @@ void platform_delay(uint32_t ms)
while (!platform_timeout_is_expired(&timeout)); while (!platform_timeout_is_expired(&timeout));
} }
uint32_t platform_target_voltage_sense(void)
{
uint32_t val;
adc_start();
while (!(1&(ADC->intflag)));
val = ((485*adc_result())>>12); /* 330 without divider, 485 with it */
return val;
}
const char *platform_target_voltage(void) const char *platform_target_voltage(void)
{ {
uint32_t voltage; uint32_t voltage;
@ -243,8 +253,7 @@ const char *platform_target_voltage(void)
adc_start(); adc_start();
while (!(1&(ADC->intflag))); voltage = platform_target_voltage_sense();
voltage = ((485*adc_result())>>12); /* 330 without divider, 485 with it */
out[0] = '0' + (char)(voltage/100); out[0] = '0' + (char)(voltage/100);
out[2] = '0' + (char)((voltage/10) % 10); out[2] = '0' + (char)((voltage/10) % 10);