Merge pull request #2126 from hierophect/stm32-pin-remap

tannewt · web-flow · commit 42d37c5c5167 · 2019-09-13T09:03:03.000-07:00
STM32 pin remap
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_CDC_AND_MSC_ONLY = 1
+USB_DEVICES = "CDC,MSC"
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
diff --git a/ports/stm32f4/common-hal/digitalio/DigitalInOut.c b/ports/stm32f4/common-hal/digitalio/DigitalInOut.c
@@ -33,7 +33,7 @@
 
 void common_hal_digitalio_digitalinout_never_reset(
         digitalio_digitalinout_obj_t *self) {
-    never_reset_pin_number(self->pin->port_number, self->pin->number);
+    never_reset_pin_number(self->pin->port, self->pin->number);
 }
 
 digitalinout_result_t common_hal_digitalio_digitalinout_construct(
@@ -43,11 +43,11 @@ digitalinout_result_t common_hal_digitalio_digitalinout_construct(
     self->pin = pin;
 
     GPIO_InitTypeDef GPIO_InitStruct = {0};
-    GPIO_InitStruct.Pin = (1 << pin->number);
+    GPIO_InitStruct.Pin = pin_mask(self->pin->number);
     GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
     GPIO_InitStruct.Pull = GPIO_NOPULL;
     GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-    HAL_GPIO_Init(pin->port, &GPIO_InitStruct);
+    HAL_GPIO_Init(pin_port(self->pin->number), &GPIO_InitStruct);
 
     return DIGITALINOUT_OK;
 }
@@ -61,19 +61,19 @@ void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t *self
         return;
     }
 
-    reset_pin_number(self->pin->port_number, self->pin->number);
+    reset_pin_number(self->pin->port, self->pin->number);
     self->pin = mp_const_none;
 }
 
 void common_hal_digitalio_digitalinout_switch_to_input(
         digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
 
     GPIO_InitTypeDef GPIO_InitStruct = {0};
-    GPIO_InitStruct.Pin = (1 << self->pin->number);
+    GPIO_InitStruct.Pin = pin_mask(self->pin->number);
     GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
     GPIO_InitStruct.Pull = GPIO_NOPULL;
     GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-    HAL_GPIO_Init(self->pin->port, &GPIO_InitStruct);
+    HAL_GPIO_Init(pin_port(self->pin->number), &GPIO_InitStruct);
 
     common_hal_digitalio_digitalinout_set_pull(self, pull);
 }
@@ -89,38 +89,38 @@ void common_hal_digitalio_digitalinout_switch_to_output(
 digitalio_direction_t common_hal_digitalio_digitalinout_get_direction(
         digitalio_digitalinout_obj_t *self) {
 
-    return (LL_GPIO_GetPinMode(self->pin->port, (1 << self->pin->number)) 
+    return (LL_GPIO_GetPinMode(pin_port(self->pin->number), pin_mask(self->pin->number)) 
         == LL_GPIO_MODE_INPUT) ? DIRECTION_INPUT : DIRECTION_OUTPUT;
 }
 
 void common_hal_digitalio_digitalinout_set_value(
         digitalio_digitalinout_obj_t *self, bool value) {
-    HAL_GPIO_WritePin(self->pin->port, 1 << self->pin->number, value);
+    HAL_GPIO_WritePin(pin_port(self->pin->number), pin_mask(self->pin->number), value);
 }
 
 bool common_hal_digitalio_digitalinout_get_value(
         digitalio_digitalinout_obj_t *self) {
-    return (LL_GPIO_GetPinMode(self->pin->port, (1 << self->pin->number)) == LL_GPIO_MODE_INPUT)
-        ? HAL_GPIO_ReadPin(self->pin->port, (1 << self->pin->number))
-        : LL_GPIO_IsOutputPinSet(self->pin->port, (1 << self->pin->number));
+    return (LL_GPIO_GetPinMode(pin_port(self->pin->number), pin_mask(self->pin->number)) == LL_GPIO_MODE_INPUT)
+        ? HAL_GPIO_ReadPin(pin_port(self->pin->number), pin_mask(self->pin->number))
+        : LL_GPIO_IsOutputPinSet(pin_port(self->pin->number), pin_mask(self->pin->number));
 }
 
 void common_hal_digitalio_digitalinout_set_drive_mode(
         digitalio_digitalinout_obj_t *self,
         digitalio_drive_mode_t drive_mode) {
     GPIO_InitTypeDef GPIO_InitStruct = {0};
-    GPIO_InitStruct.Pin = (1 << self->pin->number);
+    GPIO_InitStruct.Pin = pin_mask(self->pin->number);
     GPIO_InitStruct.Mode = (drive_mode == DRIVE_MODE_OPEN_DRAIN ? 
         GPIO_MODE_OUTPUT_OD : GPIO_MODE_OUTPUT_PP);
     GPIO_InitStruct.Pull = GPIO_NOPULL;
     GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-    HAL_GPIO_Init(self->pin->port, &GPIO_InitStruct);
+    HAL_GPIO_Init(pin_port(self->pin->number), &GPIO_InitStruct);
 }
 
 digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
         digitalio_digitalinout_obj_t *self) {
 
-    return LL_GPIO_GetPinOutputType(self->pin->port, (1 << self->pin->port_number)) 
+    return LL_GPIO_GetPinOutputType(pin_port(self->pin->number), pin_mask(self->pin->number)) 
         == LL_GPIO_OUTPUT_OPENDRAIN ? DRIVE_MODE_OPEN_DRAIN : DRIVE_MODE_PUSH_PULL;
 }
 
@@ -129,13 +129,13 @@ void common_hal_digitalio_digitalinout_set_pull(
 
     switch (pull) {
         case PULL_UP:
-            LL_GPIO_SetPinPull(self->pin->port,(1 << self->pin->number),LL_GPIO_PULL_UP);
+            LL_GPIO_SetPinPull(pin_port(self->pin->number), pin_mask(self->pin->number),LL_GPIO_PULL_UP);
             break;
         case PULL_DOWN:
-            LL_GPIO_SetPinPull(self->pin->port,(1 << self->pin->number),LL_GPIO_PULL_DOWN);
+            LL_GPIO_SetPinPull(pin_port(self->pin->number), pin_mask(self->pin->number),LL_GPIO_PULL_DOWN);
             break;
         case PULL_NONE:
-            LL_GPIO_SetPinPull(self->pin->port,(1 << self->pin->number),LL_GPIO_PULL_NO);
+            LL_GPIO_SetPinPull(pin_port(self->pin->number), pin_mask(self->pin->number),LL_GPIO_PULL_NO);
             break;
         default:
             break;
@@ -146,7 +146,7 @@ digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(
         digitalio_digitalinout_obj_t *self) {
     
 
-    switch (LL_GPIO_GetPinPull(self->pin->port,(1 << self->pin->number))) {
+    switch (LL_GPIO_GetPinPull(pin_port(self->pin->number), pin_mask(self->pin->number))) {
         case LL_GPIO_PULL_UP:
             return PULL_UP;
         case LL_GPIO_PULL_DOWN:
diff --git a/ports/stm32f4/common-hal/microcontroller/Pin.c b/ports/stm32f4/common-hal/microcontroller/Pin.c
@@ -54,33 +54,38 @@ void reset_all_pins(void) {
 
 // Mark pin as free and return it to a quiescent state.
 void reset_pin_number(uint8_t pin_port, uint8_t pin_number) {
-    if (pin_number == NO_PIN) {
+    if (pin_port == 0x0F) {
         return;
     }
 
     // Clear claimed bit.
-    claimed_pins[pin_port] &= ~(1 << pin_number);
+    claimed_pins[pin_port] &= ~(1<<pin_number);
     // Reset the pin
-    HAL_GPIO_DeInit(ports[pin_port], (1 << pin_number));
+    HAL_GPIO_DeInit(ports[pin_port], 1<<pin_number);
 }
 
 
 void never_reset_pin_number(uint8_t pin_port, uint8_t pin_number) {
-    never_reset_pins[pin_port] |= 1 << pin_number;
+    never_reset_pins[pin_port] |= 1<<pin_number;
 }
 
 void claim_pin(const mcu_pin_obj_t* pin) {
     // Set bit in claimed_pins bitmask.
-    claimed_pins[pin->port_number] |= 1 << pin->number;
+    claimed_pins[pin->port] |= 1<<pin->number;
 }
 
-
 bool pin_number_is_free(uint8_t pin_port, uint8_t pin_number) {
-    return !(claimed_pins[pin_port] & (1 << pin_number));
+    return !(claimed_pins[pin_port] & 1<<pin_number);
 }
 
 bool common_hal_mcu_pin_is_free(const mcu_pin_obj_t *pin) {
+    return pin_number_is_free(pin->port, pin->number);
+}
 
-    return pin_number_is_free(pin->port_number, pin->number);
+GPIO_TypeDef * pin_port(uint8_t pin_port) {
+    return ports[pin_port];
+}
 
+uint16_t pin_mask(uint8_t pin_number) {
+    return 1<<pin_number;
 }
diff --git a/ports/stm32f4/common-hal/microcontroller/Pin.h b/ports/stm32f4/common-hal/microcontroller/Pin.h
@@ -34,9 +34,11 @@
 void reset_all_pins(void);
 // reset_pin_number takes the pin number instead of the pointer so that objects don't
 // need to store a full pointer.
-void reset_pin_number(uint8_t pin_port, uint8_t pin);
+void reset_pin_number(uint8_t pin_port, uint8_t pin_number);
 void claim_pin(const mcu_pin_obj_t* pin);
 bool pin_number_is_free(uint8_t pin_port, uint8_t pin_number);
 void never_reset_pin_number(uint8_t pin_port, uint8_t pin_number);
+GPIO_TypeDef * pin_port(uint8_t pin_port);
+uint16_t pin_mask(uint8_t pin_number);
 
 #endif // MICROPY_INCLUDED_STM34F4_COMMON_HAL_MICROCONTROLLER_PIN_H
diff --git a/ports/stm32f4/peripherals/stm32f4/pins.h b/ports/stm32f4/peripherals/stm32f4/pins.h
@@ -38,28 +38,38 @@
 
 typedef struct {
     mp_obj_base_t base;
-    //uint8_t number; //(3)port,(5)pin 
-    uint8_t port_number;
-    GPIO_TypeDef * port;
-    uint8_t number;
+    uint8_t port:4;
+    uint8_t number:4;
+    uint8_t adc_unit:3; 
+    uint8_t adc_channel:5;
 } mcu_pin_obj_t;
 
-// extern GPIO_TypeDef *port_lookup_table[];
+#define ADC_1 	1
+#define ADC_123	7
+#define ADC_12 	3
+#define ADC_3 	4
 
-// static inline GPIO_TypeDef * get_GPIO_ptr(const mcu_pin_obj_t *p)
-// {
-// 	return port_lookup_table[0x7&( (p->number) >> 5)];
-// }
+//STM32 ADC pins can have a combination of 1, 2 or all 3 ADCs on a single pin,
+//but all 3 ADCs will share the same input number per pin. 
+//F4 family has 3 ADC max, 24 channels max. 
+#define ADC_INPUT(mask, number) \
+	.adc_unit = mask, \
+	.adc_channel = number,
+
+#define NO_ADC \
+	.adc_unit = 0x00, \
+	.adc_channel = 0x1f
 
 extern const mp_obj_type_t mcu_pin_type;
 
-// Used in device-specific pins.c
-#define PIN(p_port_num, p_port, p_number)       \
+// STM32 can have up to 9 ports, each restricted to 16 pins
+// We split the pin/port evenly, in contrast to nrf. 
+#define PIN(p_port, p_number, p_adc)       \
 { \
     { &mcu_pin_type }, \
-    .port_number = (p_port_num), \
-    .port = (p_port),      \
-    .number = (p_number), \
+    .port = p_port, \
+    .number = p_number, \
+    p_adc \
 }
 
 // Use illegal pin value to mark unassigned pins.
diff --git a/ports/stm32f4/peripherals/stm32f4/stm32f411xe/pins.c b/ports/stm32f4/peripherals/stm32f4/stm32f411xe/pins.c
diff --git a/ports/stm32f4/peripherals/stm32f4/stm32f412zx/pins.c b/ports/stm32f4/peripherals/stm32f4/stm32f412zx/pins.c
