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

canio: rename from _canio 

This reflects our belief that the API is stable enough to avoid incompatible changes during 6.x.
This commit is contained in:
Jeff Epler 2020-09-21 16:42:12 -05:00
parent 493679da3b
commit 4869dbdc67
23 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main.c
View File

@ -82,7 +82,7 @@
#endif
#if CIRCUITPY_CANIO
#include "common-hal/_canio/CAN.h"
#include "common-hal/canio/CAN.h"
#endif
void do_str(const char *src, mp_parse_input_kind_t input_kind) {

2
ports/atmel-samd/common-hal/_canio/CAN.c → ports/atmel-samd/common-hal/canio/CAN.c
View File

@ -31,7 +31,7 @@
#include "peripheral_clk_config.h"
#include "common-hal/_canio/CAN.h"
#include "common-hal/canio/CAN.h"
#include "shared-bindings/microcontroller/Pin.h"
#include "shared-bindings/util.h"
#include "supervisor/port.h"

8
ports/atmel-samd/common-hal/_canio/CAN.h → ports/atmel-samd/common-hal/canio/CAN.h
View File

@ -27,12 +27,12 @@
#pragma once
#include "py/obj.h"
#include "shared-bindings/_canio/__init__.h"
#include "shared-bindings/_canio/CAN.h"
#include "shared-bindings/canio/__init__.h"
#include "shared-bindings/canio/CAN.h"
#include "component/can.h"
#include "common-hal/microcontroller/Pin.h"
#include "common-hal/_canio/__init__.h"
#include "shared-module/_canio/Message.h"
#include "common-hal/canio/__init__.h"
#include "shared-module/canio/Message.h"
#define COMMON_HAL_CAN_RX_FIFO_LEN (2)
#define COMMON_HAL_CAN_TX_FIFO_LEN (2)

4
ports/atmel-samd/common-hal/_canio/Listener.c → ports/atmel-samd/common-hal/canio/Listener.c
View File

@ -30,8 +30,8 @@
#include "py/obj.h"
#include "py/runtime.h"
#include "common-hal/_canio/__init__.h"
#include "common-hal/_canio/Listener.h"
#include "common-hal/canio/__init__.h"
#include "common-hal/canio/Listener.h"
#include "shared-bindings/util.h"
#include "supervisor/shared/tick.h"
#include "component/can.h"

4
ports/atmel-samd/common-hal/_canio/Listener.h → ports/atmel-samd/common-hal/canio/Listener.h
View File

@ -26,8 +26,8 @@
#pragma once
#include "common-hal/_canio/CAN.h"
#include "shared-module/_canio/Match.h"
#include "common-hal/canio/CAN.h"
#include "shared-module/canio/Match.h"
typedef struct {
__IO CAN_RXF0C_Type RXFC; /**< \brief (R/W 32) Rx FIFO n Configuration */

0
ports/atmel-samd/common-hal/_canio/__init__.c → ports/atmel-samd/common-hal/canio/__init__.c
View File

0
ports/atmel-samd/common-hal/_canio/__init__.h → ports/atmel-samd/common-hal/canio/__init__.h
View File

14
py/circuitpy_defns.mk
View File

@ -143,7 +143,7 @@ ifeq ($(CIRCUITPY_CAMERA),1)
SRC_PATTERNS += camera/%
endif
ifeq ($(CIRCUITPY_CANIO),1)
SRC_PATTERNS += _canio/%
SRC_PATTERNS += canio/%
endif
ifeq ($(CIRCUITPY_COUNTIO),1)
SRC_PATTERNS += countio/%
@ -318,9 +318,9 @@ SRC_COMMON_HAL_ALL = \
busio/__init__.c \
camera/__init__.c \
camera/Camera.c \
_canio/CAN.c \
_canio/Listener.c \
_canio/__init__.c \
canio/CAN.c \
canio/Listener.c \
canio/__init__.c \
countio/Counter.c \
countio/__init__.c \
digitalio/DigitalInOut.c \
@ -390,7 +390,7 @@ $(filter $(SRC_PATTERNS), \
_bleio/Address.c \
_bleio/Attribute.c \
_bleio/ScanEntry.c \
_canio/Match.c \
canio/Match.c \
_eve/__init__.c \
camera/ImageFormat.c \
digitalio/Direction.c \
@ -409,8 +409,8 @@ SRC_SHARED_MODULE_ALL = \
_bleio/Attribute.c \
_bleio/ScanEntry.c \
_bleio/ScanResults.c \
_canio/Match.c \
_canio/Message.c \
canio/Match.c \
canio/Message.c \
_eve/__init__.c \
_pixelbuf/PixelBuf.c \
_pixelbuf/__init__.c \

2
py/circuitpy_mpconfig.h
View File

@ -338,7 +338,7 @@ extern const struct _mp_obj_module_t camera_module;
#if CIRCUITPY_CANIO
extern const struct _mp_obj_module_t canio_module;
#define CANIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR__canio), (mp_obj_t)&canio_module },
#define CANIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_canio), (mp_obj_t)&canio_module },
#else
#define CANIO_MODULE
#endif

14
shared-bindings/_canio/CAN.c → shared-bindings/canio/CAN.c
View File

@ -25,13 +25,13 @@
*/
#include "py/enum.h"
#include "common-hal/_canio/CAN.h"
#include "common-hal/_canio/Listener.h"
#include "shared-bindings/_canio/__init__.h"
#include "shared-bindings/_canio/CAN.h"
#include "shared-bindings/_canio/Listener.h"
#include "shared-bindings/_canio/Match.h"
#include "shared-bindings/_canio/Message.h"
#include "common-hal/canio/CAN.h"
#include "common-hal/canio/Listener.h"
#include "shared-bindings/canio/__init__.h"
#include "shared-bindings/canio/CAN.h"
#include "shared-bindings/canio/Listener.h"
#include "shared-bindings/canio/Match.h"
#include "shared-bindings/canio/Message.h"
#include "shared-bindings/microcontroller/Pin.h"
#include "py/objproperty.h"

2
shared-bindings/_canio/CAN.h → shared-bindings/canio/CAN.h
View File

@ -28,7 +28,7 @@
#include "py/obj.h"
#include "shared-bindings/microcontroller/Pin.h"
#include "shared-bindings/_canio/Message.h"
#include "shared-bindings/canio/Message.h"
extern const mp_obj_type_t canio_can_type;

6
shared-bindings/_canio/Listener.c → shared-bindings/canio/Listener.c
View File

@ -24,9 +24,9 @@
* THE SOFTWARE.
*/
#include "shared-bindings/_canio/Listener.h"
#include "shared-bindings/_canio/Message.h"
#include "common-hal/_canio/Listener.h"
#include "shared-bindings/canio/Listener.h"
#include "shared-bindings/canio/Message.h"
#include "common-hal/canio/Listener.h"
#include "py/runtime.h"
#include "py/objproperty.h"

0
shared-bindings/_canio/Listener.h → shared-bindings/canio/Listener.h
View File

2
shared-bindings/_canio/Match.c → shared-bindings/canio/Match.c
View File

@ -24,7 +24,7 @@
* THE SOFTWARE.
*/
#include "shared-bindings/_canio/Match.h"
#include "shared-bindings/canio/Match.h"
#include "py/objproperty.h"
#include "py/runtime.h"

2
shared-bindings/_canio/Match.h → shared-bindings/canio/Match.h
View File

@ -27,7 +27,7 @@
#pragma once
#include "py/obj.h"
#include "shared-module/_canio/Match.h"
#include "shared-module/canio/Match.h"
extern const mp_obj_type_t canio_match_type;

2
shared-bindings/_canio/Message.c → shared-bindings/canio/Message.c
View File

@ -24,7 +24,7 @@
* THE SOFTWARE.
*/
#include "shared-bindings/_canio/Message.h"
#include "shared-bindings/canio/Message.h"
#include "py/obj.h"
#include "py/objproperty.h"

2
shared-bindings/_canio/Message.h → shared-bindings/canio/Message.h
View File

@ -27,7 +27,7 @@
#pragma once
#include "py/obj.h"
#include "shared-module/_canio/Message.h"
#include "shared-module/canio/Message.h"
extern const mp_obj_type_t canio_message_type;

10
shared-bindings/_canio/__init__.c → shared-bindings/canio/__init__.c
View File

@ -60,11 +60,11 @@
#include "py/obj.h"
#include "py/enum.h"
#include "shared-bindings/_canio/__init__.h"
#include "shared-bindings/_canio/CAN.h"
#include "shared-bindings/_canio/Match.h"
#include "shared-bindings/_canio/Message.h"
#include "shared-bindings/_canio/Listener.h"
#include "shared-bindings/canio/__init__.h"
#include "shared-bindings/canio/CAN.h"
#include "shared-bindings/canio/Match.h"
#include "shared-bindings/canio/Message.h"
#include "shared-bindings/canio/Listener.h"
MAKE_ENUM_VALUE(canio_bus_state_type, bus_state, ERROR_ACTIVE, BUS_STATE_ERROR_ACTIVE);
MAKE_ENUM_VALUE(canio_bus_state_type, bus_state, ERROR_PASSIVE, BUS_STATE_ERROR_PASSIVE);

0
shared-bindings/_canio/__init__.h → shared-bindings/canio/__init__.h
View File

2
shared-module/_canio/Match.c → shared-module/canio/Match.c
View File

@ -24,7 +24,7 @@
* THE SOFTWARE.
*/
#include "shared-module/_canio/Match.h"
#include "shared-module/canio/Match.h"
void common_hal_canio_match_construct(canio_match_obj_t *self, int address, int mask, bool extended) {
self->address = address;

0
shared-module/_canio/Match.h → shared-module/canio/Match.h
View File

2
shared-module/_canio/Message.c → shared-module/canio/Message.c
View File

@ -24,7 +24,7 @@
* THE SOFTWARE.
*/
#include "shared-module/_canio/Message.h"
#include "shared-module/canio/Message.h"
#include <string.h>

0
shared-module/_canio/Message.h → shared-module/canio/Message.h
View File