diff --git a/main/station_example_main.c b/main/station_example_main.c index 34cc204..12d8252 100755 --- a/main/station_example_main.c +++ b/main/station_example_main.c @@ -24,7 +24,7 @@ #define SERVER_URL "http://192.168.178.157:8080/data" -#define NUM_MEASUREMENTS 100000 +#define NUM_MEASUREMENTS 20000 #define CHANNEL ADC_CHANNEL_6 #define CALIBRATION_FACTOR 1600.0f @@ -137,8 +137,10 @@ static void adc_init(void) } } -const double upper = 0.24107260247486464 * CALIBRATION_FACTOR + CALIBRATION_FACTOR; -const double lower = -0.2247819992266048 * CALIBRATION_FACTOR + CALIBRATION_FACTOR; + +const double upper = 1931.009445512987; +const double lower = 1371.4123048766235; +const double nominal_v = 230.0; static float read_voltage(void) { @@ -148,8 +150,8 @@ static float read_voltage(void) ESP_ERROR_CHECK(adc_cali_raw_to_voltage(cali_handle, raw, &mv)); } - return (float)mv; - // return (mv - lower) / (upper - lower) * 2.0 * 325.0 - 325.0; + // return (float)mv; + return (mv - lower) / (upper - lower) * 2.0 * nominal_v - nominal_v; } /* ===================== HTTP ===================== */