Skip to content

Commit 195867e

Browse files
dhalbertdhalbert
committed
Merge remote-tracking branch 'adafruit/main' into fix-i2s-error-message
2 parents 0029617 + 3febd56 commit 195867e

File tree

8 files changed

+600
-364
lines changed

8 files changed

+600
-364
lines changed

‎locale/cs.po

Lines changed: 370 additions & 358 deletions
Large diffs are not rendered by default.

‎locale/ru.po

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: PACKAGE VERSION\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"PO-Revision-Date: 2023-09-10 08:50+0000\n"
10+
"PO-Revision-Date: 2023-10-13 20:08+0000\n"
1111
"Last-Translator: xXx <[email protected]>\n"
1212
"Language-Team: none\n"
1313
"Language: ru\n"
@@ -16,7 +16,7 @@ msgstr ""
1616
"Content-Transfer-Encoding: 8bit\n"
1717
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
1818
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19-
"X-Generator: Weblate 5.0.1-dev\n"
19+
"X-Generator: Weblate 5.1-dev\n"
2020

2121
#: main.c
2222
msgid ""
@@ -213,7 +213,7 @@ msgstr "%q должно быть <= %d"
213213

214214
#: ports/espressif/common-hal/watchdog/WatchDogTimer.c
215215
msgid "%q must be <= %u"
216-
msgstr ""
216+
msgstr "%q должно быть <= %u"
217217

218218
#: py/argcheck.c
219219
msgid "%q must be >= %d"

‎locale/zh_Latn_pinyin.po

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ msgstr ""
77
"Project-Id-Version: circuitpython-cn\n"
88
"Report-Msgid-Bugs-To: \n"
99
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
10-
"PO-Revision-Date: 2023-09-13 17:49+0000\n"
10+
"PO-Revision-Date: 2023-10-13 20:08+0000\n"
1111
"Last-Translator: hexthat <[email protected]>\n"
1212
"Language-Team: Chinese Hanyu Pinyin\n"
1313
"Language: zh_Latn_pinyin\n"
1414
"MIME-Version: 1.0\n"
1515
"Content-Type: text/plain; charset=UTF-8\n"
1616
"Content-Transfer-Encoding: 8bit\n"
1717
"Plural-Forms: nplurals=1; plural=0;\n"
18-
"X-Generator: Weblate 5.0.1-dev\n"
18+
"X-Generator: Weblate 5.1-dev\n"
1919

2020
#: main.c
2121
msgid ""
@@ -212,7 +212,7 @@ msgstr "%q bìxū <= %d"
212212

213213
#: ports/espressif/common-hal/watchdog/WatchDogTimer.c
214214
msgid "%q must be <= %u"
215-
msgstr ""
215+
msgstr "%q bì xū <= %u"
216216

217217
#: py/argcheck.c
218218
msgid "%q must be >= %d"

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

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
7+
*
8+
* Permission is hereby granted, free of charge, to any person obtaining a copy
9+
* of this software and associated documentation files (the "Software"), to deal
10+
* in the Software without restriction, including without limitation the rights
11+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
* copies of the Software, and to permit persons to whom the Software is
13+
* furnished to do so, subject to the following conditions:
14+
*
15+
* The above copyright notice and this permission notice shall be included in
16+
* all copies or substantial portions of the Software.
17+
*
18+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24+
* THE SOFTWARE.
25+
*/
26+
27+
#include "supervisor/board.h"
28+
#include "mpconfigboard.h"
29+
#include "shared-bindings/busio/SPI.h"
30+
#include "shared-bindings/displayio/FourWire.h"
31+
#include "shared-bindings/microcontroller/Pin.h"
32+
#include "shared-module/displayio/__init__.h"
33+
#include "shared-module/displayio/mipi_constants.h"
34+
#include "shared-bindings/board/__init__.h"
35+
36+
displayio_fourwire_obj_t board_display_obj;
37+
38+
#define DELAY 0x80
39+
40+
// display init sequence according to ST7789
41+
uint8_t display_init_sequence[] = {
42+
0x01, 0 | DELAY, 0x96, // _SWRESET and Delay 150ms
43+
0x11, 0 | DELAY, 0xff, // _SLPOUT and Delay 500ms
44+
0x3A, 1 | DELAY, 0x55, 0x0a, // _COLMOD and Delay 10ms
45+
0x36, 0x01, 0x08, // _MADCTL
46+
0x21, 0x80, 0x0A, // _INVON Hack and Delay 10ms
47+
0x13, 0x80, 0x0A, // _NORON and Delay 10ms
48+
0x36, 0x01, 0xC0, // _MADCTL
49+
0x29, 0 | DELAY, 0xff // _DISPON and Delay 500ms
50+
};
51+
52+
53+
void board_init(void) {
54+
displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
55+
// busio_spi_obj_t *spi = common_hal_board_create_spi(0);
56+
busio_spi_obj_t *spi = &bus->inline_bus;
57+
common_hal_busio_spi_construct(spi, &pin_GPIO17, &pin_GPIO21, NULL, false);
58+
common_hal_busio_spi_never_reset(spi);
59+
bus->base.type = &displayio_fourwire_type;
60+
61+
common_hal_displayio_fourwire_construct(
62+
bus,
63+
spi,
64+
&pin_GPIO33, // DC
65+
&pin_GPIO15, // CS
66+
&pin_GPIO34, // RST
67+
40000000, // baudrate
68+
0, // polarity
69+
0 // phase
70+
);
71+
displayio_display_obj_t *display = &allocate_display()->display;
72+
display->base.type = &displayio_display_type;
73+
74+
common_hal_displayio_display_construct(
75+
display,
76+
bus,
77+
128, // width (after rotation)
78+
128, // height (after rotation)
79+
2, // column start
80+
1, // row start
81+
0, // rotation
82+
16, // color depth
83+
false, // grayscale
84+
false, // pixels in a byte share a row. Only valid for depths < 8
85+
1, // bytes per cell. Only valid for depths < 8
86+
false, // reverse_pixels_in_byte. Only valid for depths < 8
87+
true, // reverse_pixels_in_word
88+
MIPI_COMMAND_SET_COLUMN_ADDRESS, // set column command
89+
MIPI_COMMAND_SET_PAGE_ADDRESS, // set row command
90+
MIPI_COMMAND_WRITE_MEMORY_START, // write memory command
91+
display_init_sequence,
92+
sizeof(display_init_sequence),
93+
&pin_GPIO16, // backlight pin
94+
NO_BRIGHTNESS_COMMAND,
95+
1.0f, // brightness
96+
false, // single_byte_bounds
97+
false, // data_as_commands
98+
true, // auto_refresh
99+
60, // native_frames_per_second
100+
true, // backlight_on_high
101+
false, // SH1107_addressing
102+
200 // backlight pwm frequency
103+
);
104+
}
105+
106+
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2019 Scott Shawcroft for Adafruit Industries
7+
*
8+
* Permission is hereby granted, free of charge, to any person obtaining a copy
9+
* of this software and associated documentation files (the "Software"), to deal
10+
* in the Software without restriction, including without limitation the rights
11+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
* copies of the Software, and to permit persons to whom the Software is
13+
* furnished to do so, subject to the following conditions:
14+
*
15+
* The above copyright notice and this permission notice shall be included in
16+
* all copies or substantial portions of the Software.
17+
*
18+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24+
* THE SOFTWARE.
25+
*/
26+
27+
// Micropython setup
28+
29+
#define MICROPY_HW_BOARD_NAME "M5Stack AtomS3"
30+
#define MICROPY_HW_MCU_NAME "ESP32S3"
31+
32+
// #define MICROPY_HW_NEOPIXEL (&pin_GPIO35)
33+
34+
#define CIRCUITPY_BOARD_I2C (2)
35+
#define CIRCUITPY_BOARD_I2C_PIN {{.scl = &pin_GPIO39, .sda = &pin_GPIO38}, \
36+
{.scl = &pin_GPIO1, .sda = &pin_GPIO2}}
37+
38+
#define DEFAULT_SPI_BUS_SCK (&pin_GPIO17)
39+
#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO21)

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
USB_VID = 0x303A
2+
USB_PID = 0x8120
3+
USB_PRODUCT = "M5Stack AtomS3"
4+
USB_MANUFACTURER = "M5Stack"
5+
6+
IDF_TARGET = esp32s3
7+
8+
CIRCUITPY_ESP_FLASH_MODE = qio
9+
CIRCUITPY_ESP_FLASH_FREQ = 80m
10+
CIRCUITPY_ESP_FLASH_SIZE = 8MB
11+
CIRCUITPY_ESPCAMERA = 0

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

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
#include "shared-bindings/board/__init__.h"
2+
#include "shared-module/displayio/__init__.h"
3+
4+
CIRCUITPY_BOARD_BUS_SINGLETON(porta_i2c, i2c, 1)
5+
6+
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
7+
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
8+
9+
{ MP_ROM_QSTR(MP_QSTR_PORTA_SCL), MP_ROM_PTR(&pin_GPIO1) },
10+
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO1) },
11+
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO1) },
12+
13+
{ MP_ROM_QSTR(MP_QSTR_PORTA_SDA), MP_ROM_PTR(&pin_GPIO2) },
14+
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO2) },
15+
{ MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) },
16+
17+
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO5) },
18+
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
19+
20+
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO6) },
21+
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
22+
23+
{ MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO7) },
24+
{ MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
25+
26+
{ MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO8) },
27+
{ MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) },
28+
29+
{ MP_ROM_QSTR(MP_QSTR_D39), MP_ROM_PTR(&pin_GPIO39) },
30+
{ MP_ROM_QSTR(MP_QSTR_IMU_SCL), MP_ROM_PTR(&pin_GPIO39) },
31+
{ MP_ROM_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_GPIO38) },
32+
{ MP_ROM_QSTR(MP_QSTR_IMU_SDA), MP_ROM_PTR(&pin_GPIO38) },
33+
34+
// lcd spi bus
35+
{ MP_ROM_QSTR(MP_QSTR_LCD_MOSI), MP_ROM_PTR(&pin_GPIO21) },
36+
{ MP_ROM_QSTR(MP_QSTR_LCD_CLK), MP_ROM_PTR(&pin_GPIO17) },
37+
{ MP_ROM_QSTR(MP_QSTR_LCD_DC), MP_ROM_PTR(&pin_GPIO33) },
38+
{ MP_ROM_QSTR(MP_QSTR_LCD_RST), MP_ROM_PTR(&pin_GPIO34) },
39+
{ MP_ROM_QSTR(MP_QSTR_LCD_CS), MP_ROM_PTR(&pin_GPIO15) },
40+
{ MP_ROM_QSTR(MP_QSTR_LCD_BL), MP_ROM_PTR(&pin_GPIO16) },
41+
42+
{ MP_ROM_QSTR(MP_QSTR_BTN), MP_ROM_PTR(&pin_GPIO41) },
43+
44+
{ MP_ROM_QSTR(MP_QSTR_IR_LED), MP_ROM_PTR(&pin_GPIO4) },
45+
46+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
47+
{ MP_ROM_QSTR(MP_QSTR_PORTA_I2C), MP_ROM_PTR(&board_porta_i2c_obj) },
48+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
49+
50+
{ MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)}
51+
};
52+
53+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

‎ports/espressif/boards/m5stack_atoms3/sdkconfig

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#
2+
# Espressif IoT Development Framework Configuration
3+
#
4+
#
5+
# Component config
6+
#
7+
#
8+
# LWIP
9+
#
10+
CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
11+
# end of LWIP
12+
13+
# end of Component config
14+
15+
# end of Espressif IoT Development Framework Configuration

0 commit comments

Comments
 (0)