Zenoh

angular-client/src/pages/efuses-page/efuses-page.topics.ts

@@ -4,8 +4,8 @@ const _FORMAT_EFUSE_TOPICS = (eFuse: string) =>
     ADC: `VCU/eFuses/${eFuse}/ADC`,
     Voltage: `VCU/eFuses/${eFuse}/Voltage`,
     Current: `VCU/eFuses/${eFuse}/Current`,
-    Faulted: `VCU/eFuses/${eFuse}/Faulted?`,
-    Enabled: `VCU/eFuses/${eFuse}/Enabled?`,
+    Faulted: `VCU/eFuses/${eFuse}/Faulted`,
+    Enabled: `VCU/eFuses/${eFuse}/Enabled`,
     Control_State: `VCU/eFuses/${eFuse}/Control_State`
   }) as const;
 

compose/compose.router.yml

@@ -1,28 +1,26 @@
 services:
   scylla-server:
-    depends_on:
-      - siren
     environment:
-      - SCYLLA_SIREN_HOST_URL=siren:1883
       - SCYLLA_BATCH_UPSERT_TIME=20
+      - SCYLLA_ZENOH=true
     init: false
 
   client:
     extends:
       file: ../angular-client/compose.client.yml
       service: client
 
-  grafana:
-    extends:
-      file: ../siren-base/compose.grafana.yml
-      service: grafana
-    depends_on:
-      - siren
+  # grafana:
+  #   extends:
+  #     file: ../siren-base/compose.grafana.yml
+  #     service: grafana
+  #   depends_on:
+  #     - siren
 
-  siren:
-    extends:
-      file: ../siren-base/compose.siren.yml
-      service: siren
+  # siren:
+  #   extends:
+  #     file: ../siren-base/compose.siren.yml
+  #     service: siren
 
   siren-av:
     network_mode: host

compose/compose.yml

@@ -32,6 +32,11 @@ services:
       - DATABASE_URL=postgresql://postgres:password@odyssey-db:5432/postgres
       - RUST_LOG=warn,scylla_server=debug
       - SCYLLA_PORT=${SCYLLA_HOST_PORT:-8000}
+      - SCYLLA_ZENOH_CONF=/zenoh.json5
+    volumes:
+      - ../siren-base/zenoh.json5:/zenoh.json5:ro
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     cpu_shares: 1024
     stop_grace_period: 2m
     stop_signal: SIGINT