Skip to content

Commit 4869dbd

Browse files
jeplerjepler
committed
canio: rename from _canio
This reflects our belief that the API is stable enough to avoid incompatible changes during 6.x.
1 parent 493679d commit 4869dbd

23 files changed

Lines changed: 40 additions & 40 deletions

File tree

‎main.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
#endif
8383

8484
#if CIRCUITPY_CANIO
85-
#include "common-hal/_canio/CAN.h"
85+
#include "common-hal/canio/CAN.h"
8686
#endif
8787

8888
void do_str(const char *src, mp_parse_input_kind_t input_kind) {

ports/atmel-samd/common-hal/_canio/CAN.c renamed to ports/atmel-samd/common-hal/canio/CAN.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
#include "peripheral_clk_config.h"
3333

34-
#include "common-hal/_canio/CAN.h"
34+
#include "common-hal/canio/CAN.h"
3535
#include "shared-bindings/microcontroller/Pin.h"
3636
#include "shared-bindings/util.h"
3737
#include "supervisor/port.h"

ports/atmel-samd/common-hal/_canio/CAN.h renamed to ports/atmel-samd/common-hal/canio/CAN.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
#pragma once
2828

2929
#include "py/obj.h"
30-
#include "shared-bindings/_canio/__init__.h"
31-
#include "shared-bindings/_canio/CAN.h"
30+
#include "shared-bindings/canio/__init__.h"
31+
#include "shared-bindings/canio/CAN.h"
3232
#include "component/can.h"
3333
#include "common-hal/microcontroller/Pin.h"
34-
#include "common-hal/_canio/__init__.h"
35-
#include "shared-module/_canio/Message.h"
34+
#include "common-hal/canio/__init__.h"
35+
#include "shared-module/canio/Message.h"
3636

3737
#define COMMON_HAL_CAN_RX_FIFO_LEN (2)
3838
#define COMMON_HAL_CAN_TX_FIFO_LEN (2)

ports/atmel-samd/common-hal/_canio/Listener.c renamed to ports/atmel-samd/common-hal/canio/Listener.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
#include "py/obj.h"
3131
#include "py/runtime.h"
3232

33-
#include "common-hal/_canio/__init__.h"
34-
#include "common-hal/_canio/Listener.h"
33+
#include "common-hal/canio/__init__.h"
34+
#include "common-hal/canio/Listener.h"
3535
#include "shared-bindings/util.h"
3636
#include "supervisor/shared/tick.h"
3737
#include "component/can.h"

ports/atmel-samd/common-hal/_canio/Listener.h renamed to ports/atmel-samd/common-hal/canio/Listener.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626

2727
#pragma once
2828

29-
#include "common-hal/_canio/CAN.h"
30-
#include "shared-module/_canio/Match.h"
29+
#include "common-hal/canio/CAN.h"
30+
#include "shared-module/canio/Match.h"
3131

3232
typedef struct {
3333
__IO CAN_RXF0C_Type RXFC; /**< \brief (R/W 32) Rx FIFO n Configuration */

ports/atmel-samd/common-hal/_canio/__init__.c renamed to ports/atmel-samd/common-hal/canio/__init__.c

File renamed without changes.

ports/atmel-samd/common-hal/_canio/__init__.h renamed to ports/atmel-samd/common-hal/canio/__init__.h

File renamed without changes.

‎py/circuitpy_defns.mk‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ ifeq ($(CIRCUITPY_CAMERA),1)
143143
SRC_PATTERNS += camera/%
144144
endif
145145
ifeq ($(CIRCUITPY_CANIO),1)
146-
SRC_PATTERNS += _canio/%
146+
SRC_PATTERNS += canio/%
147147
endif
148148
ifeq ($(CIRCUITPY_COUNTIO),1)
149149
SRC_PATTERNS += countio/%
@@ -318,9 +318,9 @@ SRC_COMMON_HAL_ALL = \
318318
busio/__init__.c \
319319
camera/__init__.c \
320320
camera/Camera.c \
321-
_canio/CAN.c \
322-
_canio/Listener.c \
323-
_canio/__init__.c \
321+
canio/CAN.c \
322+
canio/Listener.c \
323+
canio/__init__.c \
324324
countio/Counter.c \
325325
countio/__init__.c \
326326
digitalio/DigitalInOut.c \
@@ -390,7 +390,7 @@ $(filter $(SRC_PATTERNS), \
390390
_bleio/Address.c \
391391
_bleio/Attribute.c \
392392
_bleio/ScanEntry.c \
393-
_canio/Match.c \
393+
canio/Match.c \
394394
_eve/__init__.c \
395395
camera/ImageFormat.c \
396396
digitalio/Direction.c \
@@ -409,8 +409,8 @@ SRC_SHARED_MODULE_ALL = \
409409
_bleio/Attribute.c \
410410
_bleio/ScanEntry.c \
411411
_bleio/ScanResults.c \
412-
_canio/Match.c \
413-
_canio/Message.c \
412+
canio/Match.c \
413+
canio/Message.c \
414414
_eve/__init__.c \
415415
_pixelbuf/PixelBuf.c \
416416
_pixelbuf/__init__.c \

‎py/circuitpy_mpconfig.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ extern const struct _mp_obj_module_t camera_module;
338338

339339
#if CIRCUITPY_CANIO
340340
extern const struct _mp_obj_module_t canio_module;
341-
#define CANIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR__canio), (mp_obj_t)&canio_module },
341+
#define CANIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_canio), (mp_obj_t)&canio_module },
342342
#else
343343
#define CANIO_MODULE
344344
#endif

shared-bindings/_canio/CAN.c renamed to shared-bindings/canio/CAN.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
*/
2626

2727
#include "py/enum.h"
28-
#include "common-hal/_canio/CAN.h"
29-
#include "common-hal/_canio/Listener.h"
30-
#include "shared-bindings/_canio/__init__.h"
31-
#include "shared-bindings/_canio/CAN.h"
32-
#include "shared-bindings/_canio/Listener.h"
33-
#include "shared-bindings/_canio/Match.h"
34-
#include "shared-bindings/_canio/Message.h"
28+
#include "common-hal/canio/CAN.h"
29+
#include "common-hal/canio/Listener.h"
30+
#include "shared-bindings/canio/__init__.h"
31+
#include "shared-bindings/canio/CAN.h"
32+
#include "shared-bindings/canio/Listener.h"
33+
#include "shared-bindings/canio/Match.h"
34+
#include "shared-bindings/canio/Message.h"
3535
#include "shared-bindings/microcontroller/Pin.h"
3636

3737
#include "py/objproperty.h"

0 commit comments

Comments
 (0)