Merge branch 'main' into rc

synnaxlabs · Nov 6, 2024 · 2cd161c · 2cd161c
2 parents fd74a90 + 9694cb5
commit 2cd161c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/console/release-spec.json b/console/release-spec.json
@@ -16,4 +16,4 @@
       "url": "https://github.com/synnaxlabs/synnax/releases/download/console-v0.34.0-rc/Synnax_0.34.0_x64_en-US.msi"
     }
   }
-}
+}
diff --git a/console/src/hardware/labjack/task/Write.tsx b/console/src/hardware/labjack/task/Write.tsx
@@ -214,7 +214,7 @@ const Wrapped = ({
           commandsToCreate.map((c, i) => ({
             name: `${dev.properties.identifier}_${c.type}_${c.port}_cmd`,
             index: commandIndexes[i].key,
-            dataType: "uint8",
+            dataType: c.type === "AO" ? "float32" : "uint8",
           })),
         );
         commands.forEach((s, i) => {

diff --git a/driver/labjack/writer.h b/driver/labjack/writer.h
@@ -111,7 +111,10 @@ struct WriterConfig {
 
     WriterConfig() = default;
 
-    explicit WriterConfig(config::Parser &parser)
+    explicit WriterConfig(
+            config::Parser &parser,
+            const std::shared_ptr<task::Context> &ctx
+        )
         : device_type(parser.optional<std::string>("type", "")),
           device_key(parser.required<std::string>("device")),
           state_rate(synnax::Rate(parser.optional<int>("state_rate", 1))),
@@ -122,10 +125,16 @@ struct WriterConfig {
         if (!parser.ok())
             LOG(ERROR) << "Failed to parse writer config: " << parser.error_json().dump(4);
 
-        parser.iter("channels", [this](config::Parser &channel_parser) {
+        parser.iter("channels", [this, ctx](config::Parser &channel_parser) {
             auto channel = WriterChannelConfig(channel_parser);
-            channels.emplace_back(channel);
 
+            auto [channel_info, err] = ctx->client->channels.retrieve(channel.cmd_key);
+            if (err) {
+                LOG(ERROR) << "Failed to retrieve channel info for key " << channel.cmd_key;
+                return;
+            }
+            channel.data_type = channel_info.data_type;
+            channels.emplace_back(channel);
 
             /// digital outputs start active high
             double initial_val = 0.0;

diff --git a/driver/labjack/writer_task.cpp b/driver/labjack/writer_task.cpp
@@ -54,7 +54,7 @@ std::unique_ptr<task::Task> labjack::WriterTask::configure(
     };
 
     auto parser = config::Parser(task.config);
-    WriterConfig writer_config(parser);
+    WriterConfig writer_config(parser, ctx);
 
     auto sink = std::make_shared<labjack::WriteSink>(
         ctx,