canio: rename from _canio

This reflects our belief that the API is stable enough to avoid incompatible changes during 6.x.

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) {

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"

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)

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"

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 */

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 \

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

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"

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;
 

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"

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"

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;
 

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"

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;
 

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);

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;

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>