New formatting style

Clang formatter, Linux brace style,

Author: ianwal

.clang-format

@@ -0,0 +1,9 @@
+---
+BasedOnStyle: LLVM
+IndentWidth: 8
+UseTab: Never
+TabWidth: 8
+BreakBeforeBraces: Linux
+AllowShortIfStatementsOnASingleLine: false
+ColumnLimit: 120
+---

board/.gitignore

@@ -0,0 +1,5 @@
+.pio
+.vscode/.browse.c_cpp.db*
+.vscode/c_cpp_properties.json
+.vscode/launch.json
+.vscode/ipch

board/.vscode/settings.json

@@ -2,6 +2,9 @@
     "files.associations": {
         "cjson.h": "c"
     },
-    "editor.defaultFormatter": "ms-vscode.cpptools",
-    "editor.formatOnSave": true
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "xaver.clang-format",
+    "[c]": {
+        "editor.defaultFormatter": "xaver.clang-format"
+    },
 }

board/src/battery.c

@@ -1,6 +1,6 @@
-#include "esp_adc/adc_oneshot.h"
 #include "esp_adc/adc_cali.h"
 #include "esp_adc/adc_cali_scheme.h"
+#include "esp_adc/adc_oneshot.h"
 #include "esp_log.h"
 
 #define BATT_VOLTAGE_ADC_CHANNEL ADC_CHANNEL_3
@@ -9,112 +9,117 @@
 #define ADC_UNIT ADC_UNIT_1
 #define ADC_VREF 1100
 
-// Calibrate the battery voltage measurement based on the resistor voltage divider
+// Calibrate the battery voltage measurement
+// based on the resistor voltage divider
 #define VDIV_RATIO 5.02
 
 static const char *TAG = "Battery";
 
 adc_oneshot_unit_handle_t batt_voltage_adc_handle;
 adc_cali_handle_t batt_voltage_adc_cali_handle = NULL;
 
-static bool adc_calibration_init(adc_unit_t unit, adc_channel_t channel, adc_atten_t atten, adc_bitwidth_t bitwidth, adc_cali_handle_t *out_handle)
+static bool adc_calibration_init(adc_unit_t unit, adc_channel_t channel, adc_atten_t atten, adc_bitwidth_t bitwidth,
+                                 adc_cali_handle_t *out_handle)
 {
-    adc_cali_handle_t handle = NULL;
-    esp_err_t ret = ESP_FAIL;
-    bool calibrated = false;
-
-    if (!calibrated) {
-        #if ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED
-        adc_cali_curve_fitting_config_t cali_config = {
-            .unit_id = unit,
-            .chan = channel,
-            .atten = atten,
-            .bitwidth = bitwidth,
-        };
-        ret = adc_cali_create_scheme_curve_fitting(&cali_config, &handle);
-
-
-        #elif ADC_CALI_SCHEME_LINE_FITTING_SUPPORTED
-        adc_cali_line_fitting_config_t cali_config = {
-            .unit_id = unit,
-            .atten = atten,
-            .bitwidth = bitwidth,
-        };
-        ret = adc_cali_create_scheme_line_fitting(&cali_config, &handle);
-        #endif
+        adc_cali_handle_t handle = NULL;
+        esp_err_t ret = ESP_FAIL;
+        bool calibrated = false;
+
+        if (!calibrated) {
+#if ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED
+                adc_cali_curve_fitting_config_t cali_config = {
+                    .unit_id = unit,
+                    .chan = channel,
+                    .atten = atten,
+                    .bitwidth = bitwidth,
+                };
+                ret = adc_cali_create_scheme_curve_fitting(&cali_config, &handle);
+
+#elif ADC_CALI_SCHEME_LINE_FITTING_SUPPORTED
+                adc_cali_line_fitting_config_t cali_config = {
+                    .unit_id = unit,
+                    .atten = atten,
+                    .bitwidth = bitwidth,
+                };
+                ret = adc_cali_create_scheme_line_fitting(&cali_config, &handle);
+#endif
+
+                if (ret == ESP_OK) {
+                        calibrated = true;
+                }
+        }
 
+        *out_handle = handle;
         if (ret == ESP_OK) {
-            calibrated = true;
+                ESP_LOGI(TAG, "Calibration Success");
+        } else if (ret == ESP_ERR_NOT_SUPPORTED || !calibrated) {
+                ESP_LOGW(TAG, "eFuse not burnt, skip software calibration");
+        } else {
+                ESP_LOGE(TAG, "Invalid arg or no memory");
         }
-    }
-
-    *out_handle = handle;
-    if (ret == ESP_OK) {
-        ESP_LOGI(TAG, "Calibration Success");
-    } else if (ret == ESP_ERR_NOT_SUPPORTED || !calibrated) {
-        ESP_LOGW(TAG, "eFuse not burnt, skip software calibration");
-    } else {
-        ESP_LOGE(TAG, "Invalid arg or no memory");
-    }
-
-    return calibrated;
+
+        return calibrated;
 }
 
-// Configures the battery ADC 
+// Configures the battery ADC
 static void config_batt_adc()
 {
-    ESP_LOGI(TAG, "Configuring ADC characteristics");
-
-    // ADC1 Init
-    adc_oneshot_unit_init_cfg_t init_config1 = {
-        .unit_id = ADC_UNIT,
-        .ulp_mode = ADC_ULP_MODE_DISABLE,
-    };
-    ESP_ERROR_CHECK(adc_oneshot_new_unit(&init_config1, &batt_voltage_adc_handle));
-
-    // ADC1 Config
-    adc_oneshot_chan_cfg_t config = {
-        .bitwidth = BATT_VOLTAGE_ADC_BITWIDTH,
-        .atten = BATT_VOLTAGE_ADC_ATTEN,
-    };
-    ESP_ERROR_CHECK(adc_oneshot_config_channel(batt_voltage_adc_handle, BATT_VOLTAGE_ADC_CHANNEL, &config));
+        ESP_LOGI(TAG, "Configuring ADC characteristics");
+
+        // ADC1 Init
+        adc_oneshot_unit_init_cfg_t init_config1 = {
+            .unit_id = ADC_UNIT,
+            .ulp_mode = ADC_ULP_MODE_DISABLE,
+        };
+        ESP_ERROR_CHECK(adc_oneshot_new_unit(&init_config1, &batt_voltage_adc_handle));
+
+        // ADC1 Config
+        adc_oneshot_chan_cfg_t config = {
+            .bitwidth = BATT_VOLTAGE_ADC_BITWIDTH,
+            .atten = BATT_VOLTAGE_ADC_ATTEN,
+        };
+        ESP_ERROR_CHECK(adc_oneshot_config_channel(batt_voltage_adc_handle, BATT_VOLTAGE_ADC_CHANNEL, &config));
 }
 
 // Deinitialize calibration of an ADC handle
 static void adc_calibration_deinit(adc_cali_handle_t handle)
 {
-    #if ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED
-    ESP_ERROR_CHECK(adc_cali_delete_scheme_curve_fitting(handle));
+#if ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED
+        ESP_ERROR_CHECK(adc_cali_delete_scheme_curve_fitting(handle));
 
-    #elif ADC_CALI_SCHEME_LINE_FITTING_SUPPORTED
-    ESP_ERROR_CHECK(adc_cali_delete_scheme_line_fitting(handle));
-    #endif
+#elif ADC_CALI_SCHEME_LINE_FITTING_SUPPORTED
+        ESP_ERROR_CHECK(adc_cali_delete_scheme_line_fitting(handle));
+#endif
 }
 
-// Read ADC voltage from battery and return battery voltage calculated from the ADC and voltage divider
+// Read ADC voltage from battery and return battery
+// voltage calculated from the ADC and voltage divider
 float get_battery_voltage()
 {
-    int adc_raw[1][10];
-    int voltage[1][10];
-
-    config_batt_adc();
-
-    // ADC1 Read
-    ESP_ERROR_CHECK(adc_oneshot_read(batt_voltage_adc_handle, BATT_VOLTAGE_ADC_CHANNEL, &adc_raw[0][0]));
-    ESP_LOGI(TAG, "ADC%d Channel[%d] Raw Data: %d", ADC_UNIT + 1, BATT_VOLTAGE_ADC_CHANNEL, adc_raw[0][0]);
-    
-    // ADC1 Calibration
-    bool do_calibration_batt_voltage = adc_calibration_init(ADC_UNIT, BATT_VOLTAGE_ADC_CHANNEL, BATT_VOLTAGE_ADC_ATTEN, BATT_VOLTAGE_ADC_BITWIDTH, &batt_voltage_adc_cali_handle);
-    
-    if (do_calibration_batt_voltage) {
-        ESP_ERROR_CHECK(adc_cali_raw_to_voltage(batt_voltage_adc_cali_handle, adc_raw[0][0], &voltage[0][0]));
-        ESP_LOGI(TAG, "ADC%d Channel[%d] Cali Voltage: %d mV", ADC_UNIT + 1, BATT_VOLTAGE_ADC_CHANNEL, voltage[0][0]);
-    }
-
-    // ADC1 Teardown
-    ESP_ERROR_CHECK(adc_oneshot_del_unit(batt_voltage_adc_handle));
-    if(do_calibration_batt_voltage)
-        adc_calibration_deinit(batt_voltage_adc_cali_handle);
-
-    return (voltage[0][0] / 1000.f) * VDIV_RATIO;
+        int adc_raw[1][10];
+        int voltage[1][10];
+
+        config_batt_adc();
+
+        // ADC1 Read
+        ESP_ERROR_CHECK(adc_oneshot_read(batt_voltage_adc_handle, BATT_VOLTAGE_ADC_CHANNEL, &adc_raw[0][0]));
+        ESP_LOGI(TAG, "ADC%d Channel[%d] Raw Data: %d", ADC_UNIT + 1, BATT_VOLTAGE_ADC_CHANNEL, adc_raw[0][0]);
+
+        // ADC1 Calibration
+        bool do_calibration_batt_voltage =
+            adc_calibration_init(ADC_UNIT, BATT_VOLTAGE_ADC_CHANNEL, BATT_VOLTAGE_ADC_ATTEN, BATT_VOLTAGE_ADC_BITWIDTH,
+                                 &batt_voltage_adc_cali_handle);
+
+        if (do_calibration_batt_voltage) {
+                ESP_ERROR_CHECK(adc_cali_raw_to_voltage(batt_voltage_adc_cali_handle, adc_raw[0][0], &voltage[0][0]));
+                ESP_LOGI(TAG, "ADC%d Channel[%d] Cali Voltage: %d mV", ADC_UNIT + 1, BATT_VOLTAGE_ADC_CHANNEL,
+                         voltage[0][0]);
+        }
+
+        // ADC1 Teardown
+        ESP_ERROR_CHECK(adc_oneshot_del_unit(batt_voltage_adc_handle));
+        if (do_calibration_batt_voltage)
+                adc_calibration_deinit(batt_voltage_adc_cali_handle);
+
+        return (voltage[0][0] / 1000.f) * VDIV_RATIO;
 }