Respond to review comments

Thanks @tannewt!

4 files changed, 13 insertions, 30 deletions

diff --git a/shared-module/_canio/Match.c b/shared-module/_canio/Match.c
index 2b696addb..3dcde18a7 100644
--- a/shared-module/_canio/Match.c
+++ b/shared-module/_canio/Match.c
@@ -32,12 +32,12 @@ void common_hal_canio_match_construct(canio_match_obj_t *self, int address, int
     self->extended = extended;
 }
 
-int common_hal_canio_match_address_get(const canio_match_obj_t *self) {
+int common_hal_canio_match_get_address(const canio_match_obj_t *self) {
     return self->address;
 }
-int common_hal_canio_match_mask_get(const canio_match_obj_t *self) {
+int common_hal_canio_match_get_mask(const canio_match_obj_t *self) {
     return self->mask;
 }
-bool common_hal_canio_match_extended_get(const canio_match_obj_t *self) {
+bool common_hal_canio_match_get_extended(const canio_match_obj_t *self) {
     return self->extended;
 }
diff --git a/shared-module/_canio/Match.h b/shared-module/_canio/Match.h
index 099df976d..25f047f37 100644
--- a/shared-module/_canio/Match.h
+++ b/shared-module/_canio/Match.h
@@ -34,8 +34,3 @@ typedef struct {
     int mask;
     bool extended;
 } canio_match_obj_t;
-
-void common_hal_canio_match_construct(canio_match_obj_t *self, int address, int mask, bool extended);
-int common_hal_canio_match_address_get(const canio_match_obj_t *self);
-int common_hal_canio_match_mask_get(const canio_match_obj_t *self);
-bool common_hal_canio_match_extended_get(const canio_match_obj_t *self);
diff --git a/shared-module/_canio/Message.c b/shared-module/_canio/Message.c
index c0403b519..0caca58f0 100644
--- a/shared-module/_canio/Message.c
+++ b/shared-module/_canio/Message.c
@@ -41,57 +41,57 @@ void common_hal_canio_message_construct(canio_message_obj_t *self, int id, void
     }
 }
 
-int common_hal_canio_message_id_get(const canio_message_obj_t *self)
+int common_hal_canio_message_get_id(const canio_message_obj_t *self)
 {
     return self->id;
 }
 
-void common_hal_canio_message_id_set(canio_message_obj_t *self, int id)
+void common_hal_canio_message_set_id(canio_message_obj_t *self, int id)
 {
     self->id = id;
 }
 
 
-const void *common_hal_canio_message_data_get(const canio_message_obj_t *self)
+const void *common_hal_canio_message_get_data(const canio_message_obj_t *self)
 {
     return self->data;
 }
 
-const void common_hal_canio_message_data_set(canio_message_obj_t *self, const void *data, size_t size)
+const void common_hal_canio_message_set_data(canio_message_obj_t *self, const void *data, size_t size)
 {
     self->size = size;
     memcpy(self->data, data, size);
 }
 
 
-size_t common_hal_canio_message_size_get(const canio_message_obj_t *self)
+size_t common_hal_canio_message_get_size(const canio_message_obj_t *self)
 {
     return self->size;
 }
 
-void common_hal_canio_message_size_set(canio_message_obj_t *self, size_t size)
+void common_hal_canio_message_set_size(canio_message_obj_t *self, size_t size)
 {
     memset(self->data, 0, size);
     self->size = size;
 }
 
 
-bool common_hal_canio_message_rtr_get(const canio_message_obj_t *self)
+bool common_hal_canio_message_get_rtr(const canio_message_obj_t *self)
 {
     return self->rtr;
 }
 
-void common_hal_canio_message_rtr_set(canio_message_obj_t *self, bool rtr)
+void common_hal_canio_message_set_rtr(canio_message_obj_t *self, bool rtr)
 {
     self->rtr = rtr;
 }
 
-bool common_hal_canio_message_extended_get(const canio_message_obj_t *self)
+bool common_hal_canio_message_get_extended(const canio_message_obj_t *self)
 {
     return self->extended;
 }
 
-void common_hal_canio_message_extended_set(canio_message_obj_t *self, bool extended)
+void common_hal_canio_message_set_extended(canio_message_obj_t *self, bool extended)
 {
     self->extended = extended;
 }
diff --git a/shared-module/_canio/Message.h b/shared-module/_canio/Message.h
index b9fd8eaf2..b99c5c48e 100644
--- a/shared-module/_canio/Message.h
+++ b/shared-module/_canio/Message.h
@@ -36,15 +36,3 @@ typedef struct {
     bool rtr:1;
     bool extended:1;
 } canio_message_obj_t;
-
-void common_hal_canio_message_construct(canio_message_obj_t *self, int id, void *data, size_t size, bool rtr, bool extended);
-bool common_hal_canio_message_rtr_get(const canio_message_obj_t *self);
-bool common_hal_canio_message_extended_get(const canio_message_obj_t *self);
-int common_hal_canio_message_id_get(const canio_message_obj_t *self);
-const void *common_hal_canio_message_data_get(const canio_message_obj_t *self);
-size_t common_hal_canio_message_size_get(const canio_message_obj_t *self);
-void common_hal_canio_message_rtr_set(canio_message_obj_t *self, bool rtr);
-void common_hal_canio_message_extended_set(canio_message_obj_t *self, bool extended);
-void common_hal_canio_message_id_set(canio_message_obj_t *self, int id);
-void common_hal_canio_message_data_set(canio_message_obj_t *self, const void *data, size_t size);
-void common_hal_canio_message_size_set(canio_message_obj_t *self, size_t size);