From 61e3d065aa8602777b310c6ac1f114d1628b6139 Mon Sep 17 00:00:00 2001 From: Chris Kaczor Date: Mon, 6 Jul 2020 12:14:45 -0400 Subject: [PATCH] Reference level changes --- .../components/weather/current/weather-current.component.html | 2 +- Samsung/HomeMonitor/widget/Weather/js/main.js | 2 +- Weather/Arduino/Weather.ino | 4 ++-- Weather/Service/Data/Database.cs | 2 +- Weather/Service/Data/Resources/GetReadingHistoryGrouped.sql | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Display/src/app/components/weather/current/weather-current.component.html b/Display/src/app/components/weather/current/weather-current.component.html index 35f60d0..48de0a1 100644 --- a/Display/src/app/components/weather/current/weather-current.component.html +++ b/Display/src/app/components/weather/current/weather-current.component.html @@ -52,7 +52,7 @@ Light - {{ ((latestReading.LightLevel / latestReading.BatteryLevel) * 100).toFixed(2) }}% + {{ ((latestReading.LightLevel / 3.3) * 100).toFixed(2) }}% diff --git a/Samsung/HomeMonitor/widget/Weather/js/main.js b/Samsung/HomeMonitor/widget/Weather/js/main.js index 6efe7b9..23ceb16 100644 --- a/Samsung/HomeMonitor/widget/Weather/js/main.js +++ b/Samsung/HomeMonitor/widget/Weather/js/main.js @@ -21,7 +21,7 @@ document.getElementById("temperature-value").textContent = data.humidityTemperature.toFixed(1) + '°F'; document.getElementById("humidity-value").textContent = data.humidity.toFixed(1) + '%'; document.getElementById("pressure-value").textContent = (data.pressure / 33.864 / 100.0).toFixed(1) + '"'; - document.getElementById("light-value").textContent = ((data.lightLevel / data.batteryLevel) * 100.0).toFixed(1) + '%'; + document.getElementById("light-value").textContent = ((data.lightLevel / 3.3) * 100.0).toFixed(1) + '%'; xmlhttp = null; } else { diff --git a/Weather/Arduino/Weather.ino b/Weather/Arduino/Weather.ino index ffd161b..51b9dcd 100644 --- a/Weather/Arduino/Weather.ino +++ b/Weather/Arduino/Weather.ino @@ -193,7 +193,7 @@ void calcWeather() //This allows us to ignore what VCC might be (an Arduino plugged into USB has VCC of 4.5 to 5.2V) float get_light_level() { - float operatingVoltage = analogRead(REFERENCE_3V3); + float operatingVoltage = 1023.0; // analogRead(REFERENCE_3V3); float lightSensor = analogRead(LIGHT); @@ -210,7 +210,7 @@ float get_light_level() //3.9K on the high side (R1), and 1K on the low side (R2) float get_battery_level() { - float operatingVoltage = analogRead(REFERENCE_3V3); + float operatingVoltage = 1023.0; // analogRead(REFERENCE_3V3); float rawVoltage = analogRead(BATT); diff --git a/Weather/Service/Data/Database.cs b/Weather/Service/Data/Database.cs index 87bb869..a876b7e 100644 --- a/Weather/Service/Data/Database.cs +++ b/Weather/Service/Data/Database.cs @@ -129,7 +129,7 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service.Data switch (weatherValueType) { case WeatherValueType.LightLevel: - query = query.Replace("@Value", "LightLevel / BatteryLevel"); + query = query.Replace("@Value", "LightLevel / 3.3"); break; default: query = query.Replace("@Value", weatherValueType.ToString()); diff --git a/Weather/Service/Data/Resources/GetReadingHistoryGrouped.sql b/Weather/Service/Data/Resources/GetReadingHistoryGrouped.sql index dd9cbc9..31be8a4 100644 --- a/Weather/Service/Data/Resources/GetReadingHistoryGrouped.sql +++ b/Weather/Service/Data/Resources/GetReadingHistoryGrouped.sql @@ -13,7 +13,7 @@ FROM ( Humidity, PressureTemperature, Pressure, - LightLevel / BatteryLevel AS LightLevel, + LightLevel / 3.3 AS LightLevel, Rain FROM Reading WHERE Timestamp BETWEEN @Start AND @End