polymachine/b-parasite-esp32
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better error handling in adc.c

Browse source
This commit is contained in:
rbaron 2022-11-13 16:50:34 +01:00
parent 6b1f52925e
commit 107936770e
4 changed files with 46 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/nrf-connect/nrf52840dk_nrf52840.overlay
View file

@ -58,7 +58,8 @@
zephyr,gain = "ADC_GAIN_1_6";
zephyr,reference = "ADC_REF_INTERNAL";
zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
zephyr,input-positive = <NRF_SAADC_AIN1>;
// P0.02.
zephyr,input-positive = <NRF_SAADC_AIN0>;
zephyr,resolution = <10>;
};
@ -69,7 +70,6 @@
zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
zephyr,input-positive = <NRF_SAADC_VDD>;
zephyr,resolution = <10>;
// zephyr,oversampling = <8>;
};
};

13
code/nrf-connect/src/main.c
View file

@ -11,13 +11,18 @@ void main(void) {
LOG_ERR("Error initializing ADC.");
}
prst_adc_read_t batt;
prst_adc_soil_moisture_t soil;
prst_adc_photo_sensor_t photo;
while (true) {
prst_adc_read_t batt = prst_adc_batt_read();
prst_adc_soil_moisture_t soil = prst_adc_soil_read(batt.voltage);
prst_adc_batt_read(&batt);
prst_adc_soil_read(batt.voltage, &soil);
prst_adc_photo_read(batt.voltage, &photo);
// LOG_INF("Batt: %d mV", batt.millivolts);
LOG_INF("Soil: %.0f %% (%.3f mV)", 100 * soil.percentage,
soil.adc_read.voltage);
// LOG_INF("Soil: %.0f %% (%.3f mV)", 100 * soil.percentage,
// soil.adc_read.voltage);
LOG_INF("Photo: %u lx (%.3f mV)", photo.brightness, soil.adc_read.voltage);
k_msleep(500);
}

58
code/nrf-connect/src/prst/adc.c
View file

@ -82,58 +82,62 @@ int prst_adc_init() {
return 0;
}
prst_adc_read_t prst_adc_batt_read() {
int prst_adc_batt_read(prst_adc_read_t* out) {
int err;
prst_adc_read_t adc_read;
err = read_adc_spec(&adc_batt_spec, &adc_read);
err = read_adc_spec(&adc_batt_spec, out);
if (err) {
LOG_ERR("Error in prst_adc_batt_read");
return err;
}
return adc_read;
return 0;
}
prst_adc_soil_moisture_t prst_adc_soil_read(float battery_voltage) {
int prst_adc_soil_read(float battery_voltage, prst_adc_soil_moisture_t* out) {
int err;
// Start PWM.
err = pwm_set_pulse_dt(&soil_pwm_dt, pulse);
if (err) {
LOG_ERR("Error in pwm_set_pulse_dt");
return err;
}
k_msleep(30);
prst_adc_soil_moisture_t adc_soil_read;
err = read_adc_spec(&adc_soil_spec, &adc_soil_read.adc_read);
err = read_adc_spec(&adc_soil_spec, &out->adc_read);
if (err) {
LOG_ERR("Error in prst_adc_batt_read");
return err;
}
// Stop PWM.
err = pwm_set_pulse_dt(&soil_pwm_dt, 0);
if (err) {
LOG_ERR("Error in pwm_set_pulse_dt");
return err;
}
adc_soil_read.percentage = get_soil_moisture_percent(battery_voltage, buf);
return adc_soil_read;
out->percentage = get_soil_moisture_percent(battery_voltage, buf);
return 0;
}
prst_adc_photo_sensor_t prst_adc_photo_read(float battery_voltage) {
// int err;
// // Start PWM.
// err = pwm_set_pulse_dt(&soil_pwm_dt, pulse);
// if (err) {
// LOG_ERR("Error in pwm_set_pulse_dt");
// }
// k_msleep(30);
int prst_adc_photo_read(float battery_voltage, prst_adc_photo_sensor_t* out) {
int err;
err = read_adc_spec(&adc_soil_spec, &out->adc_read);
if (err) {
LOG_ERR("Error in prst_adc_batt_read");
return err;
}
// err = adc_sequence_init_dt(&adc_soil_spec, &sequence);
// if (err) {
// LOG_ERR("Error in adc_sequence_init_dt");
// }
// err = adc_read(adc_soil_spec.dev, &sequence);
// if (err) {
// LOG_ERR("Error in adc_read");
// }
prst_adc_photo_sensor_t ret;
return ret;
// The ALS-PT19 phototransistor is a device in which the current flow between
// its two terminals is controlled by how much light there is in the ambient.
// We measure that current by calculating the voltage across a resistor that
// is connected in series with the phototransistor.
const float phototransistor_resistor = 470.0f;
const float current_sun = 3.59e-3f;
// Assuming 10000 lux for the saturation test. Calibration with a proper light
// meter would be better.
const float lux_sun = 10000.0f;
const float current = out->adc_read.voltage / phototransistor_resistor;
out->brightness = MAX(0, MIN(lux_sun * current / current_sun, UINT16_MAX));
return 0;
}

9
code/nrf-connect/src/prst/adc.h
View file

@ -17,18 +17,17 @@ typedef struct {
} prst_adc_soil_moisture_t;
typedef struct prst_adc_photo_sensor {
int16_t raw;
float voltage;
prst_adc_read_t adc_read;
// Value in lux.
uint16_t brightness;
} prst_adc_photo_sensor_t;
int prst_adc_init();
prst_adc_read_t prst_adc_batt_read();
int prst_adc_batt_read(prst_adc_read_t* out);
prst_adc_soil_moisture_t prst_adc_soil_read(float battery_voltage);
int prst_adc_soil_read(float battery_voltage, prst_adc_soil_moisture_t* out);
prst_adc_photo_sensor_t prst_adc_photo_read(float battery_voltage);
int prst_adc_photo_read(float battery_voltage, prst_adc_photo_sensor_t* out);
#endif // _PRST_ADC_H_