Some hacky macros for error handling

code/nrf-connect/src/main.c

@@ -2,22 +2,25 @@
 #include <zephyr/zephyr.h>
 
 #include "prst/adc.h"
+#include "prst/macros.h"
 #include "prst/shtc3.h"
 
 LOG_MODULE_REGISTER(main, LOG_LEVEL_DBG);
 
-void main(void) {
+int main(void) {
   if (prst_adc_init() != 0) {
     LOG_ERR("Error initializing ADC.");
   }
 
+  // RET_IF_ERR_MSG(123, "TEST");
+
   prst_adc_read_t batt;
   prst_adc_soil_moisture_t soil;
   prst_adc_photo_sensor_t photo;
   while (true) {
-    prst_adc_batt_read(&batt);
+    RET_IF_ERR(prst_adc_batt_read(&batt));
-    prst_adc_soil_read(batt.voltage, &soil);
+    RET_IF_ERR(prst_adc_soil_read(batt.voltage, &soil));
-    prst_adc_photo_read(batt.voltage, &photo);
+    RET_IF_ERR(prst_adc_photo_read(batt.voltage, &photo));
 
     // LOG_INF("Batt: %d mV", batt.millivolts);
     // LOG_INF("Soil: %.0f %% (%.3f mV)", 100 * soil.percentage,

code/nrf-connect/src/prst/adc.c

@@ -5,6 +5,8 @@
 #include <logging/log.h>
 #include <zephyr/zephyr.h>
 
+#include "macros.h"
+
 LOG_MODULE_REGISTER(adc, LOG_LEVEL_DBG);
 
 // PWM spec for square wave. Input to the soil sensing circuit.
@@ -40,24 +42,12 @@ static inline float get_soil_moisture_percent(float battery_voltage,
 }
 
 static int read_adc_spec(const struct adc_dt_spec* spec, prst_adc_read_t* out) {
-  int err;
+  RET_IF_ERR(adc_sequence_init_dt(spec, &sequence));
-  err = adc_sequence_init_dt(spec, &sequence);
+
-  if (err) {
+  RET_IF_ERR(adc_read(spec->dev, &sequence));
-    LOG_ERR("Error in adc_sequence_init_dt");
-    return err;
-  }
-  err = adc_read(spec->dev, &sequence);
-  if (err) {
-    LOG_ERR("Error in adc_read");
-    return err;
-  }
 
   int32_t val_mv = buf;
-  err = adc_raw_to_millivolts_dt(spec, &val_mv);
+  RET_IF_ERR(adc_raw_to_millivolts_dt(spec, &val_mv));
-  if (err) {
-    LOG_ERR("Error in adc_read");
-    return err;
-  }
 
   out->raw = buf;
   out->millivolts = val_mv;
@@ -71,61 +61,34 @@ int prst_adc_init() {
       &adc_lux_spec,
       &adc_batt_spec,
   };
-  int err;
   for (int i = 0; i < sizeof(all_specs) / sizeof(all_specs[0]); i++) {
-    err = adc_channel_setup_dt(all_specs[i]);
+    RET_IF_ERR(adc_channel_setup_dt(all_specs[i]));
-    if (err) {
-      LOG_ERR("Error setting up adc_soil_spec");
-      return err;
-    }
   }
   return 0;
 }
 
 int prst_adc_batt_read(prst_adc_read_t* out) {
-  int err;
+  RET_IF_ERR(read_adc_spec(&adc_batt_spec, out));
-  err = read_adc_spec(&adc_batt_spec, out);
-  if (err) {
-    LOG_ERR("Error in prst_adc_batt_read");
-    return err;
-  }
   return 0;
 }
 
 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);
+  RET_IF_ERR(pwm_set_pulse_dt(&soil_pwm_dt, pulse));
-  if (err) {
+
-    LOG_ERR("Error in pwm_set_pulse_dt");
-    return err;
-  }
   k_msleep(30);
 
-  err = read_adc_spec(&adc_soil_spec, &out->adc_read);
+  RET_IF_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);
+  RET_IF_ERR(pwm_set_pulse_dt(&soil_pwm_dt, 0));
-  if (err) {
-    LOG_ERR("Error in pwm_set_pulse_dt");
-    return err;
-  }
 
   out->percentage = get_soil_moisture_percent(battery_voltage, buf);
   return 0;
 }
 
 int prst_adc_photo_read(float battery_voltage, prst_adc_photo_sensor_t* out) {
-  int err;
+  RET_IF_ERR(read_adc_spec(&adc_soil_spec, &out->adc_read));
-  err = read_adc_spec(&adc_soil_spec, &out->adc_read);
-  if (err) {
-    LOG_ERR("Error in prst_adc_batt_read");
-    return err;
-  }
 
   // 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.

code/nrf-connect/src/prst/macros.h

@@ -0,0 +1,19 @@
+#ifndef _PRST_MACROS_H_
+#define _PRST_MACROS_H_
+
+#define PRST_STRINGIFY(x) #x
+#define PRST_TO_STRING(x) PRST_STRINGIFY(x)
+#define PRST_LOCATION __FILE__ ":" PRST_TO_STRING(__LINE__)
+
+#define RET_IF_ERR_MSG(expr, msg)                  \
+  {                                                \
+    int err = (expr);                              \
+    if (err) {                                     \
+      LOG_ERR("Error: " msg " in " PRST_LOCATION); \
+      return err;                                  \
+    }                                              \
+  }
+
+#define RET_IF_ERR(expr) RET_IF_ERR_MSG(expr, "")
+
+#endif  // _PRST_MACROS_H_