This introduces an alternative hardware API called nativeio structure…

…d around different functions that are typically accelerated by native hardware. Its not meant to reflect the structure of the hardware. Docs are here: http://tannewt-micropython.readthedocs.io/en/microcontroller/ It differs from upstream's machine in the following ways: * Python API is identical across ports due to code structure. (Lives in shared-bindings) * Focuses on abstracting common functionality (AnalogIn) and not representing structure (ADC). * Documentation lives with code making it easy to ensure they match. * Pin is split into references (board.D13 and microcontroller.pin.PA17) and functionality (DigitalInOut). * All nativeio classes claim underlying hardware resources when inited on construction, support Context Managers (aka with statements) and have deinit methods which release the claimed hardware. * All constructors take pin references rather than peripheral ids. Its up to the implementation to find hardware or throw and exception.
adafruit · tannewt · Nov 21, 2016 · Nov 5, 2016 · Nov 21, 2016 · Nov 3, 2016
commit ccbb5e84f980e252f7380d96fcc5c417a8a64523
diff --git a/atmel-samd/Makefile b/atmel-samd/Makefile
@@ -31,7 +31,6 @@ INC += -I.
 INC += -I..
 INC += -I../lib/mp-readline
 INC += -I../lib/timeutils
-INC += -Icommon-hal/modules/
 INC += -Iasf_conf/
 INC += -Iasf/common/boards/
 INC += -Iasf/common/services/sleepmgr/
@@ -79,7 +78,23 @@ CFLAGS_CORTEX_M0 = \
 	-msoft-float \
 	-mfloat-abi=soft \
 	-fsingle-precision-constant \
+	-fno-strict-aliasing \
 	-Wdouble-promotion \
+	-Wno-endif-labels \
+	-Wstrict-prototypes \
+	-Werror-implicit-function-declaration \
+	-Wpointer-arith \
+	-Wfloat-equal \
+	-Wundef \
+	-Wshadow \
+	-Wwrite-strings \
+	-Wsign-compare \
+	-Wmissing-format-attribute \
+	-Wno-deprecated-declarations \
+	-Wpacked \
+	-Wnested-externs \
+	-Wunreachable-code \
+	-Wcast-align \
 	-D__SAMD21G18A__ \
 	-DUSB_DEVICE_PRODUCT_ID=$(USB_PID) \
 	-DUSB_DEVICE_VENDOR_ID=$(USB_VID) \
@@ -92,9 +107,15 @@ CFLAGS_CORTEX_M0 = \
 	-DEXTINT_CALLBACK_MODE=true \
 	-DUDD_ENABLE \
 	-DUSART_CALLBACK_MODE=true \
+	-DSPI_CALLBACK_MODE=false \
+	-DI2C_MASTER_CALLBACK_MODE=false \
+	-DDAC_CALLBACK_MODE=false \
+	-DTCC_ASYNC=false \
+	-DADC_CALLBACK_MODE=false \
 	-DTC_ASYNC=true \
-	-DUSB_DEVICE_LPM_SUPPORT
-CFLAGS = $(INC) -Wall -Werror -ansi -std=gnu99 -nostdlib $(CFLAGS_CORTEX_M0) $(COPT)
+	-DUSB_DEVICE_LPM_SUPPORT \
+	--param max-inline-insns-single=500
+CFLAGS = $(INC) -Wall -Werror -std=gnu11 -nostdlib $(CFLAGS_CORTEX_M0) $(COPT)
 
 #Debugging/Optimization
 # TODO(tannewt): Figure out what NDEBUG does. Adding it to the debug build
@@ -154,17 +175,10 @@ SRC_C = \
 	builtin_open.c \
 	fatfs_port.c \
 	main.c \
-	modmachine.c \
-	modmachine_adc.c \
-	modmachine_dac.c \
-	modmachine_pin.c \
-	modmachine_pwm.c \
-	modneopixel_write.c \
 	moduos.c \
-	modutime.c \
 	mphalport.c \
-	pin_named_pins.c \
-	samdneopixel.c \
+	samd21_pins.c \
+	neopixel_status.c \
 	tick.c \
 	$(FLASH_IMPL) \
 	asf/common/services/sleepmgr/samd/sleepmgr.c \
@@ -178,7 +192,6 @@ SRC_C = \
 	asf/sam0/utils/cmsis/samd21/source/gcc/startup_samd21.c \
 	asf/sam0/utils/cmsis/samd21/source/system_samd21.c \
 	asf/sam0/utils/syscalls/gcc/syscalls.c \
-	boards/samd21_pins.c \
 	boards/$(BOARD)/init.c \
 	boards/$(BOARD)/pins.c \
 	lib/fatfs/ff.c \
@@ -194,12 +207,19 @@ STM_SRC_C = $(addprefix stmhal/,\
 	input.c \
 	)
 
-# TODO(tannewt): Use this sed line to extract the RST docs from these sources:
-#   sed': sed -n 's+^//|++p' ../api/machine.c
-#
-# RST lines are prefixed with //|
 SRC_BINDINGS = \
-	modules/machine.c
+	board/__init__.c \
+	microcontroller/__init__.c \
+	microcontroller/Pin.c \
+	nativeio/__init__.c \
+	nativeio/AnalogIn.c \
+	nativeio/AnalogOut.c \
+	nativeio/DigitalInOut.c \
+	nativeio/I2C.c \
+	nativeio/PWMOut.c \
+	nativeio/SPI.c \
+	neopixel_write/__init__.c \
+	time/__init__.c
 
 SRC_BINDINGS_EXPANDED = $(addprefix shared-bindings/, $(SRC_BINDINGS)) \
                         $(addprefix common-hal/, $(SRC_BINDINGS))

diff --git a/atmel-samd/autoreset.h b/atmel-samd/autoreset.h
@@ -31,11 +31,11 @@
 
 extern volatile bool reset_next_character;
 
-void autoreset_tick();
+void autoreset_tick(void);
 
-void autoreset_start();
-void autoreset_stop();
-void autoreset_enable();
-void autoreset_disable();
+void autoreset_start(void);
+void autoreset_stop(void);
+void autoreset_enable(void);
+void autoreset_disable(void);
 
 #endif  // __MICROPY_INCLUDED_ATMEL_SAMD_AUTORESET_H__
diff --git a/atmel-samd/boards/arduino_zero/conf_usb.h b/atmel-samd/boards/arduino_zero/conf_usb.h
@@ -87,9 +87,9 @@ void usb_rts_notify(uint8_t port, bool set);
 
 //! Interface callback definition
 #define  UDI_MSC_ENABLE_EXT()          mp_msc_enable()
-extern bool mp_msc_enable();
+extern bool mp_msc_enable(void);
 #define  UDI_MSC_DISABLE_EXT()         mp_msc_disable()
-extern void mp_msc_disable();
+extern void mp_msc_disable(void);
 
 //! Enable id string of interface to add an extra USB string
 #define  UDI_MSC_STRING_ID                5

diff --git a/atmel-samd/boards/arduino_zero/mpconfigboard.h b/atmel-samd/boards/arduino_zero/mpconfigboard.h
@@ -7,6 +7,8 @@
 #define MICROPY_HW_LED_TX   PIN_PA27
 #define MICROPY_HW_LED_RX   PIN_PB03
 
-#define MICROPY_HW_NEOPIXEL PIN_PB22
+#define MICROPY_HW_NEOPIXEL &pin_PB22
 
 #define AUTORESET_DELAY_MS 500
+
+#define FLASH_INCLUDE "internal_flash.h"
diff --git a/atmel-samd/boards/arduino_zero/pins.c b/atmel-samd/boards/arduino_zero/pins.c
@@ -1,6 +1,8 @@
-#include "boards/samd21_pins.h"
+#include "shared-bindings/board/__init__.h"
 
-STATIC const mp_map_elem_t pin_board_pins_locals_dict_table[] = {
+#include "samd21_pins.h"
+
+STATIC const mp_map_elem_t board_global_dict_table[] = {
   { MP_OBJ_NEW_QSTR(MP_QSTR_A0), (mp_obj_t)&pin_PA02 },
   { MP_OBJ_NEW_QSTR(MP_QSTR_A1), (mp_obj_t)&pin_PB08 },
   { MP_OBJ_NEW_QSTR(MP_QSTR_A2), (mp_obj_t)&pin_PB09 },
@@ -27,4 +29,4 @@ STATIC const mp_map_elem_t pin_board_pins_locals_dict_table[] = {
   { MP_OBJ_NEW_QSTR(MP_QSTR_MOSI), (mp_obj_t)&pin_PB10 },
   { MP_OBJ_NEW_QSTR(MP_QSTR_MISO), (mp_obj_t)&pin_PA12 },
 };
-MP_DEFINE_CONST_DICT(pin_board_pins_locals_dict, pin_board_pins_locals_dict_table);
+MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
diff --git a/atmel-samd/boards/feather_m0_adalogger/conf_usb.h b/atmel-samd/boards/feather_m0_adalogger/conf_usb.h
@@ -87,9 +87,9 @@ void usb_rts_notify(uint8_t port, bool set);
 
 //! Interface callback definition
 #define  UDI_MSC_ENABLE_EXT()          mp_msc_enable()
-extern bool mp_msc_enable();
+extern bool mp_msc_enable(void);
 #define  UDI_MSC_DISABLE_EXT()         mp_msc_disable()
-extern void mp_msc_disable();
+extern void mp_msc_disable(void);
 
 //! Enable id string of interface to add an extra USB string
 #define  UDI_MSC_STRING_ID                5

diff --git a/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.h b/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.h
@@ -7,3 +7,5 @@
 #define MICROPY_HW_MCU_NAME "samd21g18"
 
 #define AUTORESET_DELAY_MS 500
+
+#define FLASH_INCLUDE "internal_flash.h"
diff --git a/atmel-samd/boards/feather_m0_adalogger/pins.c b/atmel-samd/boards/feather_m0_adalogger/pins.c
@@ -1,6 +1,6 @@
-#include "boards/samd21_pins.h"
+#include "samd21_pins.h"
 
-STATIC const mp_map_elem_t pin_board_pins_locals_dict_table[] = {
+STATIC const mp_map_elem_t board_global_dict_table[] = {
   { MP_OBJ_NEW_QSTR(MP_QSTR_A0), (mp_obj_t)&pin_PA02 },
   { MP_OBJ_NEW_QSTR(MP_QSTR_A1), (mp_obj_t)&pin_PB08 },
   { MP_OBJ_NEW_QSTR(MP_QSTR_A2), (mp_obj_t)&pin_PB09 },
@@ -23,4 +23,4 @@ STATIC const mp_map_elem_t pin_board_pins_locals_dict_table[] = {
   { MP_OBJ_NEW_QSTR(MP_QSTR_D12), (mp_obj_t)&pin_PA19 },
   { MP_OBJ_NEW_QSTR(MP_QSTR_D13), (mp_obj_t)&pin_PA17 },
 };
-MP_DEFINE_CONST_DICT(pin_board_pins_locals_dict, pin_board_pins_locals_dict_table);
+MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
diff --git a/atmel-samd/boards/feather_m0_basic/conf_usb.h b/atmel-samd/boards/feather_m0_basic/conf_usb.h
@@ -87,9 +87,9 @@ void usb_rts_notify(uint8_t port, bool set);
 
 //! Interface callback definition
 #define  UDI_MSC_ENABLE_EXT()          mp_msc_enable()
-extern bool mp_msc_enable();
+extern bool mp_msc_enable(void);
 #define  UDI_MSC_DISABLE_EXT()         mp_msc_disable()
-extern void mp_msc_disable();
+extern void mp_msc_disable(void);
 
 //! Enable id string of interface to add an extra USB string
 #define  UDI_MSC_STRING_ID                5

diff --git a/atmel-samd/boards/feather_m0_basic/mpconfigboard.h b/atmel-samd/boards/feather_m0_basic/mpconfigboard.h
@@ -7,3 +7,5 @@
 #define MICROPY_HW_MCU_NAME "samd21g18"
 
 #define AUTORESET_DELAY_MS 500
+
+#define FLASH_INCLUDE "internal_flash.h"
diff --git a/atmel-samd/boards/feather_m0_basic/pins.c b/atmel-samd/boards/feather_m0_basic/pins.c
@@ -1,6 +1,6 @@
-#include "boards/samd21_pins.h"
+#include "samd21_pins.h"
 
-STATIC const mp_map_elem_t pin_board_pins_locals_dict_table[] = {
+STATIC const mp_map_elem_t board_global_dict_table[] = {
   { MP_OBJ_NEW_QSTR(MP_QSTR_A0), (mp_obj_t)&pin_PA02 },
   { MP_OBJ_NEW_QSTR(MP_QSTR_A1), (mp_obj_t)&pin_PB08 },
   { MP_OBJ_NEW_QSTR(MP_QSTR_A2), (mp_obj_t)&pin_PB09 },
@@ -22,4 +22,4 @@ STATIC const mp_map_elem_t pin_board_pins_locals_dict_table[] = {
   { MP_OBJ_NEW_QSTR(MP_QSTR_D12), (mp_obj_t)&pin_PA19 },
   { MP_OBJ_NEW_QSTR(MP_QSTR_D13), (mp_obj_t)&pin_PA17 },
 };
-MP_DEFINE_CONST_DICT(pin_board_pins_locals_dict, pin_board_pins_locals_dict_table);
+MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
diff --git a/atmel-samd/boards/feather_m0_flash/conf_usb.h b/atmel-samd/boards/feather_m0_flash/conf_usb.h
@@ -87,9 +87,9 @@ void usb_rts_notify(uint8_t port, bool set);
 
 //! Interface callback definition
 #define  UDI_MSC_ENABLE_EXT()          mp_msc_enable()
-extern bool mp_msc_enable();
+extern bool mp_msc_enable(void);
 #define  UDI_MSC_DISABLE_EXT()         mp_msc_disable()
-extern void mp_msc_disable();
+extern void mp_msc_disable(void);
 
 //! Enable id string of interface to add an extra USB string
 #define  UDI_MSC_STRING_ID                5

diff --git a/atmel-samd/boards/feather_m0_flash/mpconfigboard.h b/atmel-samd/boards/feather_m0_flash/mpconfigboard.h
@@ -19,3 +19,5 @@
 #define SPI_FLASH_SERCOM      SERCOM4
 
 #define AUTORESET_DELAY_MS 500
+
+#define FLASH_INCLUDE "spi_flash.h"
diff --git a/atmel-samd/boards/metro_m0_flash/conf_usb.h b/atmel-samd/boards/metro_m0_flash/conf_usb.h
@@ -87,9 +87,9 @@ void usb_rts_notify(uint8_t port, bool set);
 
 //! Interface callback definition
 #define  UDI_MSC_ENABLE_EXT()          mp_msc_enable()
-extern bool mp_msc_enable();
+extern bool mp_msc_enable(void);
 #define  UDI_MSC_DISABLE_EXT()         mp_msc_disable()
-extern void mp_msc_disable();
+extern void mp_msc_disable(void);
 
 //! Enable id string of interface to add an extra USB string
 #define  UDI_MSC_STRING_ID                5

diff --git a/atmel-samd/boards/metro_m0_flash/mpconfigboard.h b/atmel-samd/boards/metro_m0_flash/mpconfigboard.h
@@ -8,7 +8,7 @@
 #define MICROPY_HW_LED_TX   PIN_PA27
 #define MICROPY_HW_LED_RX   PIN_PB03
 
-#define MICROPY_HW_NEOPIXEL PIN_PA30
+#define MICROPY_HW_NEOPIXEL &pin_PA30
 
 #define SPI_FLASH_BAUDRATE  (1000000)
 
@@ -33,3 +33,5 @@
 #define SPI_FLASH_SERCOM      SERCOM4
 
 #define AUTORESET_DELAY_MS 500
+
+#define FLASH_INCLUDE "spi_flash.h"
diff --git a/atmel-samd/boards/metro_m0_flash/pins.c b/atmel-samd/boards/metro_m0_flash/pins.c
@@ -1,6 +1,6 @@
-#include "boards/samd21_pins.h"
+#include "samd21_pins.h"
 
-STATIC const mp_map_elem_t pin_board_pins_locals_dict_table[] = {
+STATIC const mp_map_elem_t board_global_dict_table[] = {
   { MP_OBJ_NEW_QSTR(MP_QSTR_A0), (mp_obj_t)&pin_PA02 },
   { MP_OBJ_NEW_QSTR(MP_QSTR_A1), (mp_obj_t)&pin_PB08 },
   { MP_OBJ_NEW_QSTR(MP_QSTR_A2), (mp_obj_t)&pin_PB09 },
@@ -30,4 +30,4 @@ STATIC const mp_map_elem_t pin_board_pins_locals_dict_table[] = {
   { MP_OBJ_NEW_QSTR(MP_QSTR_FLASH_MISO), (mp_obj_t)&pin_PA12 },
   { MP_OBJ_NEW_QSTR(MP_QSTR_FLASH_CS),   (mp_obj_t)&pin_PA13 },
 };
-MP_DEFINE_CONST_DICT(pin_board_pins_locals_dict, pin_board_pins_locals_dict_table);
+MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,5 @@
		#define MICROPY_HW_MCU_NAME "samd21g18"

		#define AUTORESET_DELAY_MS 500

		#define FLASH_INCLUDE "internal_flash.h"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,3 +19,5 @@
		#define SPI_FLASH_SERCOM SERCOM4

		#define AUTORESET_DELAY_MS 500

		#define FLASH_INCLUDE "spi_flash.h"