summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xmain.c2
-rw-r--r--ports/atmel-samd/common-hal/canio/CAN.c (renamed from ports/atmel-samd/common-hal/_canio/CAN.c)2
-rw-r--r--ports/atmel-samd/common-hal/canio/CAN.h (renamed from ports/atmel-samd/common-hal/_canio/CAN.h)8
-rw-r--r--ports/atmel-samd/common-hal/canio/Listener.c (renamed from ports/atmel-samd/common-hal/_canio/Listener.c)4
-rw-r--r--ports/atmel-samd/common-hal/canio/Listener.h (renamed from ports/atmel-samd/common-hal/_canio/Listener.h)4
-rw-r--r--ports/atmel-samd/common-hal/canio/__init__.c (renamed from ports/atmel-samd/common-hal/_canio/__init__.c)0
-rw-r--r--ports/atmel-samd/common-hal/canio/__init__.h (renamed from ports/atmel-samd/common-hal/_canio/__init__.h)0
-rw-r--r--py/circuitpy_defns.mk14
-rw-r--r--py/circuitpy_mpconfig.h2
-rw-r--r--shared-bindings/canio/CAN.c (renamed from shared-bindings/_canio/CAN.c)14
-rw-r--r--shared-bindings/canio/CAN.h (renamed from shared-bindings/_canio/CAN.h)2
-rw-r--r--shared-bindings/canio/Listener.c (renamed from shared-bindings/_canio/Listener.c)6
-rw-r--r--shared-bindings/canio/Listener.h (renamed from shared-bindings/_canio/Listener.h)0
-rw-r--r--shared-bindings/canio/Match.c (renamed from shared-bindings/_canio/Match.c)2
-rw-r--r--shared-bindings/canio/Match.h (renamed from shared-bindings/_canio/Match.h)2
-rw-r--r--shared-bindings/canio/Message.c (renamed from shared-bindings/_canio/Message.c)2
-rw-r--r--shared-bindings/canio/Message.h (renamed from shared-bindings/_canio/Message.h)2
-rw-r--r--shared-bindings/canio/__init__.c (renamed from shared-bindings/_canio/__init__.c)10
-rw-r--r--shared-bindings/canio/__init__.h (renamed from shared-bindings/_canio/__init__.h)0
-rw-r--r--shared-module/canio/Match.c (renamed from shared-module/_canio/Match.c)2
-rw-r--r--shared-module/canio/Match.h (renamed from shared-module/_canio/Match.h)0
-rw-r--r--shared-module/canio/Message.c (renamed from shared-module/_canio/Message.c)2
-rw-r--r--shared-module/canio/Message.h (renamed from shared-module/_canio/Message.h)0
23 files changed, 40 insertions, 40 deletions
diff --git a/main.c b/main.c
index 4d34e451d..dbd367a59 100755
--- a/main.c
+++ b/main.c
@@ -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) {
diff --git a/ports/atmel-samd/common-hal/_canio/CAN.c b/ports/atmel-samd/common-hal/canio/CAN.c
index 0d967d7ca..01cc03dea 100644
--- a/ports/atmel-samd/common-hal/_canio/CAN.c
+++ b/ports/atmel-samd/common-hal/canio/CAN.c
@@ -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"
diff --git a/ports/atmel-samd/common-hal/_canio/CAN.h b/ports/atmel-samd/common-hal/canio/CAN.h
index 1cc34e3ac..cdea60e7d 100644
--- a/ports/atmel-samd/common-hal/_canio/CAN.h
+++ b/ports/atmel-samd/common-hal/canio/CAN.h
@@ -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)
diff --git a/ports/atmel-samd/common-hal/_canio/Listener.c b/ports/atmel-samd/common-hal/canio/Listener.c
index 0a5f629f8..bf8b3288d 100644
--- a/ports/atmel-samd/common-hal/_canio/Listener.c
+++ b/ports/atmel-samd/common-hal/canio/Listener.c
@@ -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"
diff --git a/ports/atmel-samd/common-hal/_canio/Listener.h b/ports/atmel-samd/common-hal/canio/Listener.h
index cc6770e6e..a51a9fc37 100644
--- a/ports/atmel-samd/common-hal/_canio/Listener.h
+++ b/ports/atmel-samd/common-hal/canio/Listener.h
@@ -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 */
diff --git a/ports/atmel-samd/common-hal/_canio/__init__.c b/ports/atmel-samd/common-hal/canio/__init__.c
index 7932bfc2d..7932bfc2d 100644
--- a/ports/atmel-samd/common-hal/_canio/__init__.c
+++ b/ports/atmel-samd/common-hal/canio/__init__.c
diff --git a/ports/atmel-samd/common-hal/_canio/__init__.h b/ports/atmel-samd/common-hal/canio/__init__.h
index cb491ab9e..cb491ab9e 100644
--- a/ports/atmel-samd/common-hal/_canio/__init__.h
+++ b/ports/atmel-samd/common-hal/canio/__init__.h
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index 2614dc011..98fa7a5f2 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -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 \
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index d1b12f354..0583ae1c9 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -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
diff --git a/shared-bindings/_canio/CAN.c b/shared-bindings/canio/CAN.c
index 38aed85d3..482d11546 100644
--- a/shared-bindings/_canio/CAN.c
+++ b/shared-bindings/canio/CAN.c
@@ -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"
diff --git a/shared-bindings/_canio/CAN.h b/shared-bindings/canio/CAN.h
index c591c8e6b..66c972c28 100644
--- a/shared-bindings/_canio/CAN.h
+++ b/shared-bindings/canio/CAN.h
@@ -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;
diff --git a/shared-bindings/_canio/Listener.c b/shared-bindings/canio/Listener.c
index 6186f3bbd..0b50e5835 100644
--- a/shared-bindings/_canio/Listener.c
+++ b/shared-bindings/canio/Listener.c
@@ -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"
diff --git a/shared-bindings/_canio/Listener.h b/shared-bindings/canio/Listener.h
index eaa3490df..eaa3490df 100644
--- a/shared-bindings/_canio/Listener.h
+++ b/shared-bindings/canio/Listener.h
diff --git a/shared-bindings/_canio/Match.c b/shared-bindings/canio/Match.c
index 4ff35906b..ff5d028fa 100644
--- a/shared-bindings/_canio/Match.c
+++ b/shared-bindings/canio/Match.c
@@ -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"
diff --git a/shared-bindings/_canio/Match.h b/shared-bindings/canio/Match.h
index 5522c2636..88996d730 100644
--- a/shared-bindings/_canio/Match.h
+++ b/shared-bindings/canio/Match.h
@@ -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;
diff --git a/shared-bindings/_canio/Message.c b/shared-bindings/canio/Message.c
index 487ac9bfd..11de6ded9 100644
--- a/shared-bindings/_canio/Message.c
+++ b/shared-bindings/canio/Message.c
@@ -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"
diff --git a/shared-bindings/_canio/Message.h b/shared-bindings/canio/Message.h
index ed739af0d..34b632e84 100644
--- a/shared-bindings/_canio/Message.h
+++ b/shared-bindings/canio/Message.h
@@ -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;
diff --git a/shared-bindings/_canio/__init__.c b/shared-bindings/canio/__init__.c
index 29e43c5c4..bc191913d 100644
--- a/shared-bindings/_canio/__init__.c
+++ b/shared-bindings/canio/__init__.c
@@ -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);
diff --git a/shared-bindings/_canio/__init__.h b/shared-bindings/canio/__init__.h
index e24eba92c..e24eba92c 100644
--- a/shared-bindings/_canio/__init__.h
+++ b/shared-bindings/canio/__init__.h
diff --git a/shared-module/_canio/Match.c b/shared-module/canio/Match.c
index 3dcde18a7..9e33b956f 100644
--- a/shared-module/_canio/Match.c
+++ b/shared-module/canio/Match.c
@@ -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;
diff --git a/shared-module/_canio/Match.h b/shared-module/canio/Match.h
index 25f047f37..25f047f37 100644
--- a/shared-module/_canio/Match.h
+++ b/shared-module/canio/Match.h
diff --git a/shared-module/_canio/Message.c b/shared-module/canio/Message.c
index a02bd0127..b8ebb7859 100644
--- a/shared-module/_canio/Message.c
+++ b/shared-module/canio/Message.c
@@ -24,7 +24,7 @@
* THE SOFTWARE.
*/
-#include "shared-module/_canio/Message.h"
+#include "shared-module/canio/Message.h"
#include <string.h>
diff --git a/shared-module/_canio/Message.h b/shared-module/canio/Message.h
index b99c5c48e..b99c5c48e 100644
--- a/shared-module/_canio/Message.h
+++ b/shared-module/canio/Message.h
generated by cgit v1.2.3 (git 2.39.1) at 2026-08-07 13:01:43 +0000