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

esp32s2: canio: respond to review comments 

* explain the introduction of the temporary variable in get_t_config
 * get rid of unneeded __attribute__
 * get rid of unneeded members of canio_can_obj_t
 * get rid of unneeded header inclusion
This commit is contained in:
Jeff Epler 2020-10-26 19:18:37 -05:00
parent 2ba6659967
commit 3a501a0495
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ports/esp32s2/common-hal/canio/CAN.c
View File

@ -33,7 +33,6 @@
#include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/microcontroller/Pin.h"
#include "shared-bindings/util.h" #include "shared-bindings/util.h"
#include "supervisor/port.h" #include "supervisor/port.h"
#include "hal/twai_ll.h"
#include "hal/twai_types.h" #include "hal/twai_types.h"
@ -43,6 +42,10 @@ twai_timing_config_t get_t_config(int baudrate) {
switch(baudrate) { switch(baudrate) {
case 1000000: case 1000000:
{ {
// TWAI_TIMING_CONFIG_abc expands to a C designated initializer list
// { .brp = 4, ...}. This is only acceptable to the compiler as an
// initializer and 'return TWAI_TIMING_CONFIG_1MBITS()` is not valid.
// Instead, introduce a temporary, named variable and return it.
twai_timing_config_t t_config = TWAI_TIMING_CONFIG_1MBITS(); twai_timing_config_t t_config = TWAI_TIMING_CONFIG_1MBITS();
return t_config; return t_config;
} }
@ -116,7 +119,6 @@ twai_timing_config_t get_t_config(int baudrate) {
} }
} }
__attribute__((optimize("O0")))
void common_hal_canio_can_construct(canio_can_obj_t *self, mcu_pin_obj_t *tx, mcu_pin_obj_t *rx, int baudrate, bool loopback, bool silent) void common_hal_canio_can_construct(canio_can_obj_t *self, mcu_pin_obj_t *tx, mcu_pin_obj_t *rx, int baudrate, bool loopback, bool silent)
{ {
#define DIV_ROUND(a, b) (((a) + (b)/2) / (b)) #define DIV_ROUND(a, b) (((a) + (b)/2) / (b))
@ -129,7 +131,7 @@ void common_hal_canio_can_construct(canio_can_obj_t *self, mcu_pin_obj_t *tx, mc
mp_raise_ValueError(translate("loopback + silent mode not supported by peripheral")); mp_raise_ValueError(translate("loopback + silent mode not supported by peripheral"));
} }
self->t_config = get_t_config(baudrate);; twai_timing_config_t t_config = get_t_config(baudrate);
twai_general_config_t g_config = TWAI_GENERAL_CONFIG_DEFAULT(-1, -1, TWAI_MODE_NORMAL); twai_general_config_t g_config = TWAI_GENERAL_CONFIG_DEFAULT(-1, -1, TWAI_MODE_NORMAL);
g_config.tx_io = tx->number; g_config.tx_io = tx->number;
g_config.rx_io = rx->number; g_config.rx_io = rx->number;
@ -139,14 +141,10 @@ void common_hal_canio_can_construct(canio_can_obj_t *self, mcu_pin_obj_t *tx, mc
if (silent) { if (silent) {
g_config.mode = TWAI_MODE_LISTEN_ONLY; g_config.mode = TWAI_MODE_LISTEN_ONLY;
} }
self->g_config = g_config;
{
twai_filter_config_t f_config = TWAI_FILTER_CONFIG_ACCEPT_ALL(); twai_filter_config_t f_config = TWAI_FILTER_CONFIG_ACCEPT_ALL();
self->f_config = f_config;
}
esp_err_t result = twai_driver_install(&self->g_config, &self->t_config, &self->f_config); esp_err_t result = twai_driver_install(&g_config, &t_config, &f_config);
if (result == ESP_ERR_NO_MEM) { if (result == ESP_ERR_NO_MEM) {
mp_raise_msg(&mp_type_MemoryError, translate("ESP-IDF memory allocation failed")); mp_raise_msg(&mp_type_MemoryError, translate("ESP-IDF memory allocation failed"));
} else if (result == ESP_ERR_INVALID_ARG) { } else if (result == ESP_ERR_INVALID_ARG) {

3
ports/esp32s2/common-hal/canio/CAN.h
View File

@ -46,7 +46,4 @@ typedef struct canio_can_obj {
bool silent:1; bool silent:1;
bool auto_restart:1; bool auto_restart:1;
bool fifo_in_use:1; bool fifo_in_use:1;
twai_filter_config_t f_config;
twai_general_config_t g_config;
twai_timing_config_t t_config;
} canio_can_obj_t; } canio_can_obj_t;