hueso/Sensor-Watch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

remove uses of deprecated watch_gpio functions

Browse Source
This commit is contained in:
joeycastillo
2024-10-07 09:01:21 -04:00
parent ab861d81d1
commit 4933a84a2c
14 changed files with 43 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
watch-library/shared/driver/spiflash.c
View File

@@ -31,11 +31,11 @@
#define SPI_FLASH_FAST_READ false
static void flash_enable(void) {
watch_set_pin_level(A3, false);
HAL_GPIO_A3_clr();
}
static void flash_disable(void) {
watch_set_pin_level(A3, true);
HAL_GPIO_A3_set();
}
static bool transfer(uint8_t *command, uint32_t command_length, uint8_t *data_in, uint8_t *data_out, uint32_t data_length) {

18
watch-library/shared/driver/thermistor_driver.c
View File

@@ -30,20 +30,22 @@ void thermistor_driver_enable(void) {
// Enable the ADC peripheral, which we'll use to read the thermistor value.
watch_enable_adc();
// Enable analog circuitry on the sense pin, which is tied to the thermistor resistor divider.
watch_enable_analog_input(THERMISTOR_SENSE_PIN);
HAL_GPIO_TEMPSENSE_in();
HAL_GPIO_TEMPSENSE_pmuxen(HAL_GPIO_PMUX_ADC);
// Enable digital output on the enable pin, which is the power to the thermistor circuit.
watch_enable_digital_output(THERMISTOR_ENABLE_PIN);
HAL_GPIO_TS_ENABLE_out();
// and make sure it's off.
watch_set_pin_level(THERMISTOR_ENABLE_PIN, !THERMISTOR_ENABLE_VALUE);
HAL_GPIO_TS_ENABLE_write(!THERMISTOR_ENABLE_VALUE);
}
void thermistor_driver_disable(void) {
// Disable the ADC peripheral.
watch_disable_adc();
// Disable analog circuitry on the sense pin to save power.
watch_disable_analog_input(THERMISTOR_SENSE_PIN);
HAL_GPIO_TEMPSENSE_pmuxdis();
HAL_GPIO_TEMPSENSE_off();
// Disable the enable pin's output circuitry.
watch_disable_digital_output(THERMISTOR_ENABLE_PIN);
HAL_GPIO_TS_ENABLE_off();
}
#if __EMSCRIPTEN__
#include <emscripten.h>
@@ -56,11 +58,11 @@ float thermistor_driver_get_temperature(void)
#else
float thermistor_driver_get_temperature(void) {
// set the enable pin to the level that powers the thermistor circuit.
watch_set_pin_level(THERMISTOR_ENABLE_PIN, THERMISTOR_ENABLE_VALUE);
HAL_GPIO_TS_ENABLE_write(THERMISTOR_ENABLE_VALUE);
// get the sense pin level
uint16_t value = watch_get_analog_pin_level(THERMISTOR_SENSE_PIN);
uint16_t value = watch_get_analog_pin_level(HAL_GPIO_TEMPSENSE_pin());
// and then set the enable pin to the opposite value to power down the thermistor circuit.
watch_set_pin_level(THERMISTOR_ENABLE_PIN, !THERMISTOR_ENABLE_VALUE);
HAL_GPIO_TS_ENABLE_write(!THERMISTOR_ENABLE_VALUE);
return watch_utility_thermistor_temperature(value, THERMISTOR_HIGH_SIDE, THERMISTOR_B_COEFFICIENT, THERMISTOR_NOMINAL_TEMPERATURE, THERMISTOR_NOMINAL_RESISTANCE, THERMISTOR_SERIES_RESISTANCE);
}