Merge pull request #127 from SpartanWorks/fixbits

A bunch of small fixes accumulated over time.
SpartanWorks · Jan 6, 2024 · b136b6e · b136b6e
2 parents 79c0c1b + 78c99b6
commit b136b6e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -120,6 +120,12 @@ jobs:
           name: test-results
           path: agent/target/test-reports/
 
+      - name: Build an Uberjar
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        working-directory: ./agent
+        run: sbt assembly
+
       - name: Build a Docker image
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/agent/build.sbt b/agent/build.sbt
@@ -60,11 +60,16 @@ lazy val root = project
     dockerEntrypoint := Seq("/opt/docker/bin/spartan-sensor-mesh", "/opt/docker/data/agent_config.json"),
     dockerExposedPorts ++= Seq(8080),
 
-    // GraalVM packaging:
+    // Uberjar
     assembly / mainClass := Some("ssm.Main"),
     assembly / assemblyJarName := s"${packageName.value}_3-${version.value}.jar",
-    graalVMNativeImageGraalVersion := Some("22.3.1"),
+    assemblyMergeStrategy := {
+      case PathList(ps @ _*) if ps.last.endsWith("module-info.class") => MergeStrategy.first
+      case x => (assemblyMergeStrategy).value(x)
+    },
 
+    // GraalVM packaging:
+    graalVMNativeImageGraalVersion := Some("22.3.1"),
     graalVMNativeImageOptions ++= Seq(
       "--no-fallback",
       "--static",

diff --git a/agent/src/main/resources/application.conf b/agent/src/main/resources/application.conf
@@ -29,6 +29,7 @@ ssm {
     logRequests = false
 
     dataPath = "./data"
+    dataPath = ${?REST_DATA_PATH}
   }
 
   mdns {

diff --git a/device/src/sensors/SDS.cpp b/device/src/sensors/SDS.cpp
@@ -74,9 +74,9 @@ SDS* SDS::create(JSONVar &config) {
     JSONVar cfg = readings[i]["widget"];
 
     if (type == "pm10") {
-      sds->pm10 = new Reading<float>(name, "SDS", type, new WindowedValue<float>(window, "μg/m³", 0, 1000), cfg);
+      sds->pm10 = new Reading<float>(name, "SDS", type, new WindowedValue<float>(window, "μg/m³", 0, 2000), cfg);
     } else if (type == "pm2.5") {
-      sds->pm25 = new Reading<float>(name, "SDS", type, new WindowedValue<float>(window, "μg/m³", 0, 1000), cfg);
+      sds->pm25 = new Reading<float>(name, "SDS", type, new WindowedValue<float>(window, "μg/m³", 0, 2000), cfg);
     }
   }
 

diff --git a/ui/src/app/components/gauge/tiered.tsx b/ui/src/app/components/gauge/tiered.tsx
@@ -1,5 +1,5 @@
 import * as preact from "preact";
-import { ColorGauge, ColorBand } from "./color";
+import { ColorBand, ColorGauge } from "./color";
 
 function identifyTier(value: number, tiers: ColorBand[], defaultTier: ColorBand): ColorBand {
   const needle = tiers.find((tier) => (tier.min <= value && tier.max > value));