Pārlūkot izejas kodu

Updating packages + small tweaks

- Don't force a manual minus sign for -0*C, the library already does
  this.
- Always show two significant digits. There's a big difference between
  0.5*C and 1.4*C.
- Build during deploy. Don't make it a separate step.
Jason Tarka 2 gadi atpakaļ
vecāks
revīzija
a85e8fce05

+ 2 - 0
Arduino/outdoor-weather-station/03_log_data.ino

@@ -3,6 +3,7 @@
 
 #define PORT 443
 
+// Connect to example.com as a test method.
 void getSomething() {
 	showProgress(PROGRESS_GREEN);
 	String content = String("GET / HTTP/1.1\r\n")
@@ -37,6 +38,7 @@ void getSomething() {
 	debug("===== Done =====");
 }
 
+// Upload data to RTDB.
 boolean uploadData(
 	float temperature,
 	float pressure,

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 425 - 334
web-view/package-lock.json


+ 14 - 14
web-view/package.json

@@ -11,11 +11,13 @@
     "build:js": "webpack --mode=production",
     "watch:js": "webpack --mode=development --watch",
     "watch:html": "npm-watch",
-    "deploy": "npm run build && scp -r build/* storm:/mnt2/nginx-data/weather/"
+    "deploy": "npm run clean && npm run build && scp -r build/* storm:/mnt2/nginx-storage/weather/"
   },
   "watch": {
     "build:html": {
-      "patterns": ["src"],
+      "patterns": [
+        "src"
+      ],
       "extensions": "html",
       "runOnChangeOnly": false
     }
@@ -24,21 +26,19 @@
   "author": "Jason Tarka <git@tarka.ca>",
   "license": "",
   "dependencies": {
-    "@types/firebase": "^3.2.1",
-    "chart.js": "^3.7.0",
-    "firebase": "^9.6.1",
-    "svg-gauge": "^1.0.6"
+    "chart.js": "^4.2.1",
+    "firebase": "^9.17.2",
+    "svg-gauge": "^1.0.7"
   },
   "devDependencies": {
-    "@types/mocha": "^9.0.0",
-    "@types/should": "^13.0.0",
-    "mocha": "^8.4.0",
+    "@types/mocha": "^10.0.1",
+    "mocha": "^10.2.0",
     "npm-watch": "^0.11.0",
     "should": "^13.2.3",
-    "ts-loader": "^9.2.6",
-    "ts-mocha": "^8.0.0",
-    "ts-node": "^10.4.0",
-    "typescript": "^4.5.4",
-    "webpack-cli": "^4.9.1"
+    "ts-loader": "^9.4.2",
+    "ts-mocha": "^10.0.0",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.9.5",
+    "webpack-cli": "^5.0.1"
   }
 }

+ 2 - 2
web-view/src/js/graphs.ts

@@ -130,8 +130,8 @@ function addGauge(
 		max: field.maxValue >= value ? field.maxValue : value + rangeIncrement,
 		min: field.minValue <= value ? field.minValue : value - rangeIncrement,
 		label: v => {
-			const sign = v > -0.5 && v < 0 ? '-' : ''; // Show minus zero
-			return `${sign}${v.toFixed(0)}${field.unit}`;
+			const decimalDigits = Math.abs(v) < 10 ? 1 : 0;
+			return `${v.toFixed(decimalDigits)}${field.unit}`;
 		},
 		color: v => {
 			let buckets = Object.keys(field.gaugeColours)

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels