Merge pull request #74 from AllenNeuralDynamics/feat-static-reg-address-to-specs

make `reg_address_to_specs` static and public

Author: Poofjunior

firmware/inc/harp_core.h

@@ -18,7 +18,7 @@
 
 // Project version
 inline constexpr size_t PICO_CORE_VERSION_MAJOR = 0;
-inline constexpr size_t PICO_CORE_VERSION_MINOR = 2;
+inline constexpr size_t PICO_CORE_VERSION_MINOR = 3;
 inline constexpr size_t PICO_CORE_VERSION_PATCH = 0;
 
 // Version of the Harp Protocol that this library most closely implements.
@@ -172,7 +172,7 @@ using enum reg_type_t;
  */
     static inline void copy_msg_payload_to_register(msg_t& msg)
     {
-        const RegSpecs& specs = self->reg_address_to_specs(msg.header.address);
+        const RegSpecs& specs = reg_address_to_specs(msg.header.address);
         memcpy((void*)specs.base_ptr, msg.payload, specs.num_bytes);
     }
 
@@ -227,7 +227,7 @@ using enum reg_type_t;
  */
     static inline void send_harp_reply(msg_type_t reply_type, uint8_t reg_name)
     {
-        const RegSpecs& specs = self->reg_address_to_specs(reg_name);
+        const RegSpecs& specs = reg_address_to_specs(reg_name);
         send_harp_reply(reply_type, reg_name, specs.base_ptr, specs.num_bytes,
                         specs.payload_type);
     }
@@ -245,7 +245,7 @@ using enum reg_type_t;
     static inline void send_harp_reply(msg_type_t reply_type, uint8_t reg_name,
                                        uint64_t harp_time_us)
     {
-        const RegSpecs& specs = self->reg_address_to_specs(reg_name);
+        const RegSpecs& specs = reg_address_to_specs(reg_name);
         send_harp_reply(reply_type, reg_name, specs.base_ptr, specs.num_bytes,
                         specs.payload_type, harp_time_us);
     }
@@ -401,6 +401,14 @@ using enum reg_type_t;
         memcpy((void*)(&self->regs.R_UUID[offset]), (void*)uuid, num_bytes);
     }
 
+/**
+ * \brief return a reference to the specified core or app register's specs used
+ *  for issuing a harp reply for that register.
+ * \details address	is the full address range where 0 is the first core
+ *  register, and APP_REG_START_ADDRESS is the first app register.
+ */
+    static const RegSpecs& reg_address_to_specs(uint8_t address);
+
 protected:
 /**
  * \brief entry point for handling incoming harp messages to core registers.
@@ -578,14 +586,6 @@ using enum reg_type_t;
  */
     static void set_timestamp_regs(uint64_t harp_time_us);
 
-/**
- * \brief return a reference to the specified core or app register's specs used
- *  for issuing a harp reply for that register.
- * \details address	is the full address range where 0 is the first core
- *  register, and APP_REG_START_ADDRESS is the first app register.
- */
-    const RegSpecs& reg_address_to_specs(uint8_t address);
-
     // core register read handler functions. Handles read operations on those
     // registers. One-per-harp-register where necessary, but read_reg_generic()
     // can be used in most cases.

firmware/src/harp_core.cpp

@@ -241,8 +241,8 @@ void HarpCore::update_state(bool force, op_mode_t forced_next_state)
 const RegSpecs& HarpCore::reg_address_to_specs(uint8_t address)
 {
     if (address < CORE_REG_COUNT)
-        return regs_.address_to_specs[address];
-    return address_to_app_reg_specs(address); // virtual. Implemented by app.
+        return self->regs_.address_to_specs[address];
+    return self->address_to_app_reg_specs(address); // virtual. Implemented by app.
 }
 
 void HarpCore::send_harp_reply(msg_type_t reply_type, uint8_t reg_name,