ckaczor/HomeMonitor
1
0
Fork 0
mirror of https://github.com/ckaczor/HomeMonitor.git synced 2026-01-13 17:22:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Reference level changes

Browse Source
This commit is contained in:
Chris Kaczor
2020-07-06 12:14:45 -04:00
parent cd2bdf63c6
commit 61e3d065aa
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Display/src/app/components/weather/current/weather-current.component.html
View File

@@ -52,7 +52,7 @@
Light Light
</td> </td>
<td> <td>
{{ ((latestReading.LightLevel / latestReading.BatteryLevel) * 100).toFixed(2) }}% {{ ((latestReading.LightLevel / 3.3) * 100).toFixed(2) }}%
</td> </td>
</tr> </tr>
</table> </table>

2
Samsung/HomeMonitor/widget/Weather/js/main.js
View File

@@ -21,7 +21,7 @@
document.getElementById("temperature-value").textContent = data.humidityTemperature.toFixed(1) + '°F'; document.getElementById("temperature-value").textContent = data.humidityTemperature.toFixed(1) + '°F';
document.getElementById("humidity-value").textContent = data.humidity.toFixed(1) + '%'; document.getElementById("humidity-value").textContent = data.humidity.toFixed(1) + '%';
document.getElementById("pressure-value").textContent = (data.pressure / 33.864 / 100.0).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; xmlhttp = null;
} else { } else {

4
Weather/Arduino/Weather.ino
View File

@@ -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) //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 get_light_level()
{ {
float operatingVoltage = analogRead(REFERENCE_3V3); float operatingVoltage = 1023.0; // analogRead(REFERENCE_3V3);
float lightSensor = analogRead(LIGHT); 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) //3.9K on the high side (R1), and 1K on the low side (R2)
float get_battery_level() float get_battery_level()
{ {
float operatingVoltage = analogRead(REFERENCE_3V3); float operatingVoltage = 1023.0; // analogRead(REFERENCE_3V3);
float rawVoltage = analogRead(BATT); float rawVoltage = analogRead(BATT);

2
Weather/Service/Data/Database.cs
View File

@@ -129,7 +129,7 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service.Data
switch (weatherValueType) switch (weatherValueType)
{ {
case WeatherValueType.LightLevel: case WeatherValueType.LightLevel:
query = query.Replace("@Value", "LightLevel / BatteryLevel"); query = query.Replace("@Value", "LightLevel / 3.3");
break; break;
default: default:
query = query.Replace("@Value", weatherValueType.ToString()); query = query.Replace("@Value", weatherValueType.ToString());

2
Weather/Service/Data/Resources/GetReadingHistoryGrouped.sql
View File

@@ -13,7 +13,7 @@ FROM (
Humidity, Humidity,
PressureTemperature, PressureTemperature,
Pressure, Pressure,
LightLevel / BatteryLevel AS LightLevel, LightLevel / 3.3 AS LightLevel,
Rain Rain
FROM Reading FROM Reading
WHERE Timestamp BETWEEN @Start AND @End WHERE Timestamp BETWEEN @Start AND @End