Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit fe75c77

Browse filesBrowse files
hierophecthierophect
committed
Fix SWO/Analog overlap, style changes
1 parent 9ee278d commit fe75c77
Copy full SHA for fe75c77

7 files changed

+17-10Lines changed: 17 additions & 10 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎ports/mimxrt10xx/boards/imxrt1010_evk/board.c‎

Copy file name to clipboardExpand all lines: ports/mimxrt10xx/boards/imxrt1010_evk/board.c
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ void board_init(void) {
3333
// SWD Pins
3434
common_hal_never_reset_pin(&pin_GPIO_AD_13); //SWDIO
3535
common_hal_never_reset_pin(&pin_GPIO_AD_12); //SWCLK
36-
common_hal_never_reset_pin(&pin_GPIO_AD_09); //SWO
3736
// FLEX flash
3837
common_hal_never_reset_pin(&pin_GPIO_SD_12);
3938
common_hal_never_reset_pin(&pin_GPIO_SD_11);
Collapse file

‎ports/mimxrt10xx/boards/imxrt1010_evk/mpconfigboard.h‎

Copy file name to clipboardExpand all lines: ports/mimxrt10xx/boards/imxrt1010_evk/mpconfigboard.h
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77

88
#define BOARD_FLASH_SIZE (16 * 1024 * 1024)
99

10+
#define DEFAULT_SPI_BUS_SCK (&pin_GPIO_AD_06)
11+
#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO_AD_04)
12+
#define DEFAULT_SPI_BUS_MISO (&pin_GPIO_AD_03)
13+
1014
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO_02)
1115
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO_01)
1216

Collapse file

‎ports/mimxrt10xx/boards/imxrt1010_evk/pins.c‎

Copy file name to clipboardExpand all lines: ports/mimxrt10xx/boards/imxrt1010_evk/pins.c
+10-4Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44

55
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
66
{ MP_OBJ_NEW_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO_09) },
7-
{ MP_OBJ_NEW_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO_09) },
87
{ MP_OBJ_NEW_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO_10) },
9-
{ MP_OBJ_NEW_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO_10) },
108
{ MP_OBJ_NEW_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO_AD_05) },
119
{ MP_OBJ_NEW_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO_AD_06) },
1210
{ MP_OBJ_NEW_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO_08) },
@@ -20,9 +18,7 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
2018
{ MP_OBJ_NEW_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO_AD_03) },
2119
{ MP_OBJ_NEW_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO_AD_06) },
2220
{ MP_OBJ_NEW_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO_01) },
23-
{ MP_OBJ_NEW_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO_01) },
2421
{ MP_OBJ_NEW_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO_02) },
25-
{ MP_OBJ_NEW_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO_02) },
2622

2723
{ MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO_AD_07) },
2824
{ MP_OBJ_NEW_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO_AD_09) },
@@ -31,6 +27,16 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
3127
{ MP_OBJ_NEW_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO_AD_01) },
3228
{ MP_OBJ_NEW_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO_AD_02) },
3329

30+
{ MP_OBJ_NEW_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO_09) },
31+
{ MP_OBJ_NEW_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO_10) },
32+
33+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO_AD_04) },
34+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO_AD_03) },
35+
{ MP_OBJ_NEW_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO_AD_06) },
36+
37+
{ MP_OBJ_NEW_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO_01) },
38+
{ MP_OBJ_NEW_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO_02) },
39+
3440
{ MP_OBJ_NEW_QSTR(MP_QSTR_USER_LED), MP_ROM_PTR(&pin_GPIO_11) },
3541
{ MP_OBJ_NEW_QSTR(MP_QSTR_USER_SW), MP_ROM_PTR(&pin_GPIO_SD_05) },
3642

Collapse file

‎ports/mimxrt10xx/boards/imxrt1020_evk/board.c‎

Copy file name to clipboardExpand all lines: ports/mimxrt10xx/boards/imxrt1020_evk/board.c
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ void board_init(void) {
3333
// SWD Pins
3434
common_hal_never_reset_pin(&pin_GPIO_AD_B0_00);//SWDIO
3535
common_hal_never_reset_pin(&pin_GPIO_AD_B0_01);//SWCLK
36-
common_hal_never_reset_pin(&pin_GPIO_AD_B0_04);//SWO
3736

3837
// FLEX flash
3938
common_hal_never_reset_pin(&pin_GPIO_SD_B1_06);
Collapse file

‎ports/mimxrt10xx/boards/imxrt1060_evk/board.c‎

Copy file name to clipboardExpand all lines: ports/mimxrt10xx/boards/imxrt1060_evk/board.c
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ void board_init(void) {
3333
// SWD Pins
3434
common_hal_never_reset_pin(&pin_GPIO_AD_B0_06);//SWDIO
3535
common_hal_never_reset_pin(&pin_GPIO_AD_B0_07);//SWCLK
36-
common_hal_never_reset_pin(&pin_GPIO_AD_B0_10);//SWO
3736

3837
// FLEX flash
3938
common_hal_never_reset_pin(&pin_GPIO_SD_B1_00);
Collapse file

‎ports/mimxrt10xx/supervisor/port.c‎

Copy file name to clipboardExpand all lines: ports/mimxrt10xx/supervisor/port.c
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,8 @@ safe_mode_t port_init(void) {
257257
// enabled. It won't occur very often so it'll be low overhead.
258258
NVIC_EnableIRQ(SNVS_HP_WRAPPER_IRQn);
259259

260-
// Note that reset_port CANNOT GO HERE, unlike other ports, since we currently rely on it to
261-
// protect never_reset pins per board.
260+
// Note that `reset_port` CANNOT GO HERE, unlike other ports, because `board_init` hasn't been
261+
// run yet, which uses `never_reset` to protect critical pins from being reset by `reset_port`.
262262

263263
if (board_requests_safe_mode()) {
264264
return USER_SAFE_MODE;
Collapse file

‎ports/stm/common-hal/busio/I2C.c‎

Copy file name to clipboardExpand all lines: ports/stm/common-hal/busio/I2C.c
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
122122
#if (CPY_STM32H7 || CPY_STM32F7)
123123
self->handle.Init.Timing = 0x40604E73; //Taken from STCube examples
124124
#else
125-
self->handle.Init.ClockSpeed = 100000;
125+
self->handle.Init.ClockSpeed = frequency;
126126
self->handle.Init.DutyCycle = I2C_DUTYCYCLE_2;
127127
#endif
128128

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.