Skip to content

Commit f10fa56

Browse files
askpatrickwaskpatrickw
committed
REPL works. Based on QTPYC3.
1 parent a3070f6 commit f10fa56

File tree

4 files changed

+58
-72
lines changed

4 files changed

+58
-72
lines changed

‎ports/espressif/boards/lolin_c3_mini/board.c

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,23 @@
2424
* THE SOFTWARE.
2525
*/
2626

27-
#include "supervisor/board.h"
28-
#include "mpconfigboard.h"
2927
#include "shared-bindings/microcontroller/Pin.h"
28+
#include "supervisor/board.h"
29+
30+
#include "components/driver/include/driver/gpio.h"
3031

3132
void board_init(void) {
32-
// Debug UART
33-
#ifdef DEBUG
34-
common_hal_never_reset_pin(&pin_GPIO20);
35-
common_hal_never_reset_pin(&pin_GPIO21);
36-
#endif /* DEBUG */
3733
}
3834

3935
bool board_requests_safe_mode(void) {
4036
return false;
4137
}
4238

43-
void reset_board(void) {
39+
bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
40+
return false;
41+
}
4442

43+
void reset_board(void) {
4544
}
4645

4746
void board_deinit(void) {

‎ports/espressif/boards/lolin_c3_mini/mpconfigboard.h

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,28 @@
2424
* THE SOFTWARE.
2525
*/
2626

27-
// Micropython setup
27+
// Board setup
2828

29-
#define MICROPY_HW_BOARD_NAME "LOLIN_C3_MINI" // from Wemos MP
29+
#define MICROPY_HW_BOARD_NAME "Wemos Lolin C3 Mini" // from Wemos MP
3030
#define MICROPY_HW_MCU_NAME "ESP32-C3FH4" // from Wemos MP
3131

3232
// From Wemos C3 Mini Schematic
3333
// https://www.wemos.cc/en/latest/_static/files/sch_c3_mini_v1.0.0.pdf
3434
// And MP Config
3535
// https://github.com/micropython/micropython/blob/master/ports/esp32/boards/LOLIN_C3_MINI
36-
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO10)
37-
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO8)
36+
// Status LED
37+
#define MICROPY_HW_NEOPIXEL (&pin_GPIO7)
3838

39-
#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO4)
40-
#define DEFAULT_SPI_BUS_MISO (&pin_GPIO3)
41-
#define DEFAULT_SPI_BUS_SCK (&pin_GPIO2)
39+
#define CIRCUITPY_BOARD_I2C (1)
40+
#define CIRCUITPY_BOARD_I2C_PIN {{.scl = &pin_GPIO6, .sda = &pin_GPIO5}}
4241

43-
#define DEFAULT_UART_BUS_RX (&pin_GPIO20)
44-
#define DEFAULT_UART_BUS_TX (&pin_GPIO21)
42+
#define CIRCUITPY_BOARD_SPI (1)
43+
#define CIRCUITPY_BOARD_SPI_PIN {{.clock = &pin_GPIO10, .mosi = &pin_GPIO7, .miso = &pin_GPIO8}}
4544

46-
// // Serial over UART
47-
#define CIRCUITPY_DEBUG_UART_RX DEFAULT_UART_BUS_RX
48-
#define CIRCUITPY_DEBUG_UART_TX DEFAULT_UART_BUS_TX
45+
#define CIRCUITPY_BOARD_UART (1)
46+
#define CIRCUITPY_BOARD_UART_PIN {{.tx = &pin_GPIO21, .rx = &pin_GPIO20}}
47+
48+
// Explanation of how a user got into safe mode
49+
#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
50+
51+
#define CIRCUITPY_ESP_USB_SERIAL_JTAG (1)

‎ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,7 @@ USB_MANUFACTURER = "Wemos"
66
IDF_TARGET = esp32c3
77

88
INTERNAL_FLASH_FILESYSTEM = 1
9-
LONGINT_IMPL = MPZ
10-
11-
# The default queue depth of 16 overflows on release builds,
12-
# so increase it to 32.
13-
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
149

1510
CIRCUITPY_ESP_FLASH_MODE=qio
1611
CIRCUITPY_ESP_FLASH_FREQ=80m
1712
CIRCUITPY_ESP_FLASH_SIZE=4MB
18-
19-
20-
# Include these Python libraries in firmware.
21-
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel

‎ports/espressif/boards/lolin_c3_mini/pins.c

Lines changed: 36 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -4,66 +4,59 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
44
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
55

66
// C3 Mini Board
7-
// From Wemos C3 Mini Schematic
7+
// Wemos Lolin C3 Mini Schematic
88
// https://www.wemos.cc/en/latest/_static/files/sch_c3_mini_v1.0.0.pdf
99
// Starting on Left side going counterclockwise
1010
// MP Config
1111
// https://github.com/micropython/micropython/blob/master/ports/esp32/boards/LOLIN_C3_MINI
1212
// C3 Data Sheet
1313
// https://www.espressif.com/sites/default/files/documentation/esp32-c3_datasheet_en.pdf
1414

15-
// 1: LAN_IN
16-
// 2: VDD3P3
17-
// 3: VDD3P3
15+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },// board singleton implicit from schematic/shield standard
16+
{ MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO9) },
17+
{ MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO9) },
18+
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO9) },
1819

19-
{ MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },// Reset Button
20-
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO0) }, // 4: GPIO0/32K_P/A0
21-
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO1) }, // 5: GPIO1/32K_N/A1
22-
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO2) }, // 6: GPIO2/A2/FSPIQ
23-
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO2) }, // mpboardconfig.h
20+
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO4) },
21+
{ MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO4) },
22+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO4) },
2423

25-
// 7: CHIP_EN
24+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO3) },
25+
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO3) },
26+
{ MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO3) },
2627

27-
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO3) }, // 8: GPIO3/A3
28-
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO3) }, // mpboardconfig.h
29-
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO4) }, // 9: GPIO4/A4/FSPIHD/MTMS
30-
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO4) }, // mpboardconfig.h
31-
{ MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) }, // 10: GPIO5/A2_0/FSPIWP/MTDI
32-
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO5) }, // Board screen has A5, Schematic has A2_0 (huh?)
28+
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO1) },
29+
{ MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO1) },
3330

34-
// 11: VDD3P3_RTC: Input power supply for RTC
31+
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO0) },
32+
{ MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO0) },
3533

36-
{ MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) }, // 12: GPIO6/FSPICLK/MTCK
37-
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO7) }, // mpboardconfig.h
38-
{ MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) }, // 13: GPIO7/FSPID/MTD0
39-
{ MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) }, // 14: GPIO8
40-
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO8) }, // mpboardconfig.h
41-
{ MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) }, // 15: GPIO9
42-
{ MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) }, // 16: GPIO10/FSPICS0
43-
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO10) }, // mpboardconfig.h
34+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO5) },
35+
{ MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO5) },
36+
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO5) },
4437

45-
// 17: VDD3P3_CPU: Input power supply for CPU IO
46-
// 18: VDD_SPI
38+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO6) },
39+
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
40+
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO6) },
4741

48-
// Ports of embedded flash for ESP32-C3FH4
49-
// 19: SPIHD
50-
// 20: SPIWP
51-
// 21: SPICSO
52-
// 22: SPICLK
53-
// 23: SPID
54-
// 24: SPIQ
42+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO21) },
43+
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO21) },
44+
{ MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO21) },
5545

56-
// 25: GPIO18/D-: Used for USB
57-
// 26: GPIO19/D+: Used for USB
46+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO20) },
47+
{ MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO20) },
48+
{ MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO20) },
5849

59-
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO20) }, // 27: GPIO20/U0RXD
60-
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO21) }, // 28: GPIO21/U0TXD
50+
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO7) },
51+
{ MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO7) },
6152

62-
// 29: XTAL_N
63-
// 30: XTAL_P
64-
// 31: VDDA
65-
// 32: VDDA
53+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO10) },
54+
{ MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO10) },
6655

67-
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },// board singleton implicit from schematic/shield standard
56+
{ MP_ROM_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO8) },
57+
58+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
59+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
60+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
6861
};
6962
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

0 commit comments

Comments
 (0)