djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

_canio: Message: setting data clears rtr, and vice versa

This commit is contained in:
Jeff Epler 2020-09-18 11:14:59 -05:00
parent a76119afcb
commit c39ec1581e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shared-bindings/_canio/Message.c
View File

@ -117,7 +117,7 @@ STATIC const mp_obj_property_t canio_message_id_obj = {
//| data: bytes //| data: bytes
//| """The content of the message, or dummy content in the case of an rtr. //| """The content of the message, or dummy content in the case of an rtr.
//| //|
//| Assigning to data also sets the length.""" //| Assigning to data also sets the length and clears the rtr flag."""
//| //|
STATIC mp_obj_t canio_message_data_get(const mp_obj_t self_in) { STATIC mp_obj_t canio_message_data_get(const mp_obj_t self_in) {
canio_message_obj_t *self = self_in; canio_message_obj_t *self = self_in;
@ -202,7 +202,7 @@ STATIC const mp_obj_property_t canio_message_extended_obj = {
//| rtr: bool //| rtr: bool
//| """True if the message represents a remote transmission request (RTR)""" //| """True if the message represents a remote transmission request (RTR). Setting rtr to true zeros out data"""
//| //|
STATIC mp_obj_t canio_message_rtr_get(const mp_obj_t self_in) { STATIC mp_obj_t canio_message_rtr_get(const mp_obj_t self_in) {
canio_message_obj_t *self = self_in; canio_message_obj_t *self = self_in;

4
shared-module/_canio/Message.c
View File

@ -59,6 +59,7 @@ const void *common_hal_canio_message_get_data(const canio_message_obj_t *self)
const void common_hal_canio_message_set_data(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->rtr = false;
self->size = size; self->size = size;
memcpy(self->data, data, size); memcpy(self->data, data, size);
} }
@ -84,6 +85,9 @@ bool common_hal_canio_message_get_rtr(const canio_message_obj_t *self)
void common_hal_canio_message_set_rtr(canio_message_obj_t *self, bool rtr) void common_hal_canio_message_set_rtr(canio_message_obj_t *self, bool rtr)
{ {
self->rtr = rtr; self->rtr = rtr;
if (rtr) {
memset(self->data, 0, self->size);
}
} }
bool common_hal_canio_message_get_extended(const canio_message_obj_t *self) bool common_hal_canio_message_get_extended(const canio_message_obj_t *self)