Add warnings, cosmetic fixes, remove vestigial modules

hierophect · hierophect · commit e490e6361fb6 · 2019-08-19T10:47:18.000-04:00
diff --git a/ports/stm32f4/boards/stm32f411ve_discovery/mpconfigboard.h b/ports/stm32f4/boards/stm32f411ve_discovery/mpconfigboard.h
@@ -35,8 +35,6 @@
 
 #define CIRCUITPY_AUTORELOAD_DELAY_MS 500
 
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x2000 - 0xC000 - CIRCUITPY_INTERNAL_NVM_SIZE)
+#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x2000 - 0xC000)
 
 #define AUTORESET_DELAY_MS 500
diff --git a/ports/stm32f4/boards/stm32f411ve_discovery/mpconfigboard.mk b/ports/stm32f4/boards/stm32f411ve_discovery/mpconfigboard.mk
@@ -2,7 +2,7 @@ USB_VID = 0x239A
 USB_PID = 0x802A
 USB_PRODUCT = "STM32F411VE Discovery Board - CPy"
 USB_MANUFACTURER = "STMicroelectronics"
-USB_REDUCED_ENDPOINT = 1
+USB_CDC_AND_MSC_ONLY = 1
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
diff --git a/ports/stm32f4/boards/stm32f412zg_discovery/mpconfigboard.h b/ports/stm32f4/boards/stm32f412zg_discovery/mpconfigboard.h
@@ -33,6 +33,5 @@
 #define FLASH_SIZE                  (0x100000)
 #define FLASH_PAGE_SIZE             (0x4000)
 
-#define CIRCUITPY_INTERNAL_NVM_SIZE (4096)
 #define AUTORESET_DELAY_MS 500
-#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
+#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000)
diff --git a/ports/stm32f4/common-hal/busio/SPI.c b/ports/stm32f4/common-hal/busio/SPI.c
@@ -34,6 +34,7 @@
 void common_hal_busio_spi_construct(busio_spi_obj_t *self,
          const mcu_pin_obj_t * clock, const mcu_pin_obj_t * mosi,
          const mcu_pin_obj_t * miso) {
+    mp_raise_NotImplementedError(translate("SPI not yet supported"));
 }
 
 void common_hal_busio_spi_never_reset(busio_spi_obj_t *self) {
diff --git a/ports/stm32f4/common-hal/busio/UART.c b/ports/stm32f4/common-hal/busio/UART.c
@@ -41,6 +41,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
         const mcu_pin_obj_t * tx, const mcu_pin_obj_t * rx, uint32_t baudrate,
         uint8_t bits, uart_parity_t parity, uint8_t stop, mp_float_t timeout,
         uint16_t receiver_buffer_size) {
+	mp_raise_NotImplementedError(translate("UART not yet supported"));
 }
 
 bool common_hal_busio_uart_deinited(busio_uart_obj_t *self) {
diff --git a/ports/stm32f4/common-hal/microcontroller/__init__.c b/ports/stm32f4/common-hal/microcontroller/__init__.c
@@ -32,7 +32,6 @@
 #include "common-hal/microcontroller/Pin.h"
 #include "common-hal/microcontroller/Processor.h"
 
-#include "shared-bindings/nvm/ByteArray.h"
 #include "shared-bindings/microcontroller/__init__.h"
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/microcontroller/Processor.h"
@@ -71,15 +70,6 @@ const mcu_processor_obj_t common_hal_mcu_processor_obj = {
     },
 };
 
-#if CIRCUITPY_INTERNAL_NVM_SIZE > 0
-// The singleton nvm.ByteArray object.
-const nvm_bytearray_obj_t common_hal_mcu_nvm_obj = {
-    .base = {
-        .type = &nvm_bytearray_type,
-    },
-};
-#endif
-
 STATIC const mp_rom_map_elem_t mcu_pin_globals_table[] = {
   { MP_ROM_QSTR(MP_QSTR_PE02), MP_ROM_PTR(&pin_PE02) },
   { MP_ROM_QSTR(MP_QSTR_PE03), MP_ROM_PTR(&pin_PE03) },
diff --git a/ports/stm32f4/common-hal/nvm/ByteArray.c b/ports/stm32f4/common-hal/nvm/ByteArray.c
diff --git a/ports/stm32f4/common-hal/nvm/ByteArray.h b/ports/stm32f4/common-hal/nvm/ByteArray.h
diff --git a/ports/stm32f4/common-hal/nvm/__init__.c b/ports/stm32f4/common-hal/nvm/__init__.c
diff --git a/ports/stm32f4/mpconfigport.mk b/ports/stm32f4/mpconfigport.mk
@@ -15,10 +15,11 @@ LONGINT_IMPL = MPZ
 #Reduced feature set for early port
 CIRCUITPY_MINIMAL_BUILD = 1
 
+CIRCUITPY_BOARD = 1
+CIRCUITPY_DIGITALIO = 1
+CIRCUITPY_MICROCONTROLLER = 1
+CIRCUITPY_BUSIO = 1
+CIRCUITPY_TIME = 1
+
 #ifeq ($(MCU_SUB_VARIANT), stm32f412zx)
-	CIRCUITPY_BOARD = 1
-	CIRCUITPY_DIGITALIO = 1
-	CIRCUITPY_MICROCONTROLLER = 1
-	CIRCUITPY_BUSIO = 1
-	CIRCUITPY_TIME = 1
 #endif
diff --git a/ports/stm32f4/peripherals/stm32f4/stm32f411xe/pins.c b/ports/stm32f4/peripherals/stm32f4/stm32f411xe/pins.c
@@ -28,9 +28,6 @@
 #include "py/mphal.h"
 #include "stm32f4/pins.h"
 
-
-//TODO
-//const mcu_pin_obj_t pin_PE02 = PIN(4, GPIOE, 2);
 const mcu_pin_obj_t pin_PE02 = PIN(4, GPIOE, 2);
 const mcu_pin_obj_t pin_PE03 = PIN(4, GPIOE, 3);
 const mcu_pin_obj_t pin_PE04 = PIN(4, GPIOE, 4);
diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk
@@ -44,10 +44,10 @@ ifdef EXTERNAL_FLASH_DEVICES
 		SRC_SUPERVISOR += supervisor/qspi_flash.c supervisor/shared/external_flash/qspi_flash.c
 	endif
 else
-	ifneq ($(DISABLE_FILESYSTEM),1)
-		SRC_SUPERVISOR += supervisor/internal_flash.c
-	else 
+	ifeq ($(DISABLE_FILESYSTEM),1)
 		SRC_SUPERVISOR += supervisor/stub/internal_flash.c
+	else 
+		SRC_SUPERVISOR += supervisor/internal_flash.c
 	endif
 endif
 
@@ -105,7 +105,7 @@ autogen_usb_descriptor.intermediate: ../../tools/gen_usb_descriptor.py Makefile
 		--serial_number_length $(USB_SERIAL_NUMBER_LENGTH)\
 		--output_c_file $(BUILD)/autogen_usb_descriptor.c\
 		--output_h_file $(BUILD)/genhdr/autogen_usb_descriptor.h\
-		--reduced_endpoint_mode $(USB_REDUCED_ENDPOINT)
+		--cdc_and_msc_only $(USB_CDC_AND_MSC_ONLY)
 
 CIRCUITPY_DISPLAY_FONT ?= "../../tools/fonts/ter-u12n.bdf"
 
diff --git a/tools/gen_usb_descriptor.py b/tools/gen_usb_descriptor.py
@@ -21,7 +21,7 @@
                     help='length needed for the serial number in digits')
 parser.add_argument('--output_c_file', type=argparse.FileType('w'), required=True)
 parser.add_argument('--output_h_file', type=argparse.FileType('w'), required=True)
-parser.add_argument('--reduced_endpoint_mode', nargs='?',const=0, type=int)
+parser.add_argument('--cdc_and_msc_only', nargs='?',const=0, type=int)
 
 args = parser.parse_args()
 
@@ -277,15 +277,15 @@ def strings_in_order(cls):
 descriptor_list.extend(msc_interfaces)
 # Only add the control interface because other audio interfaces are managed by it to ensure the
 # correct ordering.
-if not args.reduced_endpoint_mode:
+if not args.cdc_and_msc_only:
     descriptor_list.append(audio_control_interface)
 # Put the CDC IAD just before the CDC interfaces.
 # There appears to be a bug in the Windows composite USB driver that requests the
 # HID report descriptor with the wrong interface number if the HID interface is not given
 # first. However, it still fetches the descriptor anyway. We could reorder the interfaces but
 # the Windows 7 Adafruit_usbser.inf file thinks CDC is at Interface 0, so we'll leave it
 # there for backwards compatibility.
-if not args.reduced_endpoint_mode:
+if not args.cdc_and_msc_only:
     descriptor_list.extend(hid_interfaces)
 
 configuration = standard.ConfigurationDescriptor(

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@`
`34`	`34`	`void common_hal_busio_spi_construct(busio_spi_obj_t *self,`
`35`	`35`	`const mcu_pin_obj_t * clock, const mcu_pin_obj_t * mosi,`
`36`	`36`	`const mcu_pin_obj_t * miso) {`
	`37`	`+ mp_raise_NotImplementedError(translate("SPI not yet supported"));`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`void common_hal_busio_spi_never_reset(busio_spi_obj_t *self) {`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,`
`41`	`41`	`const mcu_pin_obj_t * tx, const mcu_pin_obj_t * rx, uint32_t baudrate,`
`42`	`42`	`uint8_t bits, uart_parity_t parity, uint8_t stop, mp_float_t timeout,`
`43`	`43`	`uint16_t receiver_buffer_size) {`
	`44`	`+ mp_raise_NotImplementedError(translate("UART not yet supported"));`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`bool common_hal_busio_uart_deinited(busio_uart_obj_t *self) {`