update hepa_uv NodeId to match monorepo changes

Opentrons · Jan 12, 2024 · 0d9acdf · 0d9acdf
1 parent 13f912d
commit 0d9acdf
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/hepa-uv/core/can_tasks.cpp b/hepa-uv/core/can_tasks.cpp
@@ -46,7 +46,7 @@ struct CheckForNodeId {
         auto _node_id = arb.node_id();
         return ((_node_id == node_id) ||
                 (_node_id == can::ids::NodeId::broadcast) ||
-                (_node_id == can::ids::NodeId::hepa_filter));
+                (_node_id == can::ids::NodeId::hepa_uv));
     }
 };
 
@@ -56,7 +56,7 @@ static auto main_dispatcher = can::dispatch::Dispatcher(
         auto arb = can::arbitration_id::ArbitrationId(arbitration_id);
         auto node_id = arb.node_id();
         return ((node_id == can::ids::NodeId::broadcast) ||
-                (node_id == can::ids::NodeId::hepa_filter));
+                (node_id == can::ids::NodeId::hepa_uv));
     },
     system_dispatch_target, gripper_info_dispatch_target,
     eeprom_dispatch_target);
@@ -95,7 +95,7 @@ void callback(void*, uint32_t identifier, uint8_t* data, uint8_t length) {
                         can::arbitration_id::ArbitrationId::node_id_bit_mask);
 
     // TODO: add HEPA/UV filter
-    filter.node_id(can::ids::NodeId::hepa_filter);
+    filter.node_id(can::ids::NodeId::hepa_uv);
     can_bus->add_filter(CanFilterType::mask, CanFilterConfig::to_fifo1, filter,
                         can::arbitration_id::ArbitrationId::node_id_bit_mask);
 

diff --git a/hepa-uv/core/tasks.cpp b/hepa-uv/core/tasks.cpp
@@ -16,7 +16,7 @@
 #pragma GCC diagnostic pop
 
 static auto tasks = hepauv_tasks::AllTask{};
-static auto queues = hepauv_tasks::QueueClient{can::ids::NodeId::hepa_filter};
+static auto queues = hepauv_tasks::QueueClient{can::ids::NodeId::hepa_uv};
 
 static auto eeprom_task_builder =
     freertos_task::TaskStarter<512, eeprom::task::EEPromTask>{};

diff --git a/include/bootloader/core/ids.h b/include/bootloader/core/ids.h
@@ -124,14 +124,14 @@ typedef enum {
     can_nodeid_gripper = 0x20,
     can_nodeid_gripper_z = 0x21,
     can_nodeid_gripper_g = 0x22,
-    can_nodeid_hepa_filter = 0x80,
+    can_nodeid_hepa_uv = 0x32,
     can_nodeid_pipette_left_bootloader = 0x6f,
     can_nodeid_pipette_right_bootloader = 0x7f,
     can_nodeid_gantry_x_bootloader = 0x3f,
     can_nodeid_gantry_y_bootloader = 0x4f,
     can_nodeid_head_bootloader = 0x5f,
     can_nodeid_gripper_bootloader = 0x2f,
-    can_nodeid_hepa_filter_bootloader = 0x8f,
+    can_nodeid_hepa_uv_bootloader = 0x3e,
 } CANNodeId;
 
 /** Common error codes. */

diff --git a/include/can/core/ids.hpp b/include/can/core/ids.hpp
@@ -126,14 +126,14 @@ enum class NodeId {
     gripper = 0x20,
     gripper_z = 0x21,
     gripper_g = 0x22,
-    hepa_filter = 0x80,
+    hepa_uv = 0x32,
     pipette_left_bootloader = 0x6f,
     pipette_right_bootloader = 0x7f,
     gantry_x_bootloader = 0x3f,
     gantry_y_bootloader = 0x4f,
     head_bootloader = 0x5f,
     gripper_bootloader = 0x2f,
-    hepa_filter_bootloader = 0x8f,
+    hepa_uv_bootloader = 0x3e,
 };
 
 /** Common error codes. */