Skip to content

Commit d23d2e7

Browse files
authored
Merge pull request #5819 from tannewt/piunora
Add Piunora and Zero. Also, enable full build
2 parents 968c57e + 4499752 commit d23d2e7

File tree

12 files changed

+322
-62
lines changed

12 files changed

+322
-62
lines changed
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2021 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+
30+
#include "bindings/videocore/Framebuffer.h"
31+
#include "shared-module/displayio/__init__.h"
32+
#include "shared-bindings/framebufferio/FramebufferDisplay.h"
33+
34+
void board_init(void) {
35+
videocore_framebuffer_obj_t *fb = &allocate_display_bus()->videocore;
36+
fb->base.type = &videocore_framebuffer_type;
37+
common_hal_videocore_framebuffer_construct(fb, 640, 480);
38+
39+
framebufferio_framebufferdisplay_obj_t *display = &displays[0].framebuffer_display;
40+
display->base.type = &framebufferio_framebufferdisplay_type;
41+
common_hal_framebufferio_framebufferdisplay_construct(
42+
display,
43+
MP_OBJ_FROM_PTR(fb),
44+
0,
45+
true);
46+
}
47+
48+
bool board_requests_safe_mode(void) {
49+
return false;
50+
}
51+
52+
void reset_board(void) {
53+
}
54+
55+
void board_deinit(void) {
56+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#define MICROPY_HW_BOARD_NAME "Diodes Delight Piunora"
2+
3+
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO3)
4+
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO2)
5+
6+
#define MICROPY_HW_NEOPIXEL (&pin_GPIO12)
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
USB_VID = 0x1209
2+
USB_PID = 0xD10D
3+
USB_PRODUCT = "Piunora"
4+
USB_MANUFACTURER = "Diodes Delight"
5+
6+
CHIP_VARIANT = "bcm2711"
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
#include "shared-bindings/board/__init__.h"
2+
3+
#include "shared-module/displayio/__init__.h"
4+
5+
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
6+
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
7+
8+
{ MP_ROM_QSTR(MP_QSTR_GPIO5), MP_ROM_PTR(&pin_GPIO5) },
9+
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO5) },
10+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO5) },
11+
12+
{ MP_ROM_QSTR(MP_QSTR_GPIO4), MP_ROM_PTR(&pin_GPIO4) },
13+
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO4) },
14+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO4) },
15+
16+
{ MP_ROM_QSTR(MP_QSTR_GPIO18), MP_ROM_PTR(&pin_GPIO18) },
17+
{ MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO18) },
18+
19+
{ MP_ROM_QSTR(MP_QSTR_GPIO19), MP_ROM_PTR(&pin_GPIO19) },
20+
{ MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO19) },
21+
22+
{ MP_ROM_QSTR(MP_QSTR_GPIO20), MP_ROM_PTR(&pin_GPIO20) },
23+
{ MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO20) },
24+
25+
{ MP_ROM_QSTR(MP_QSTR_GPIO21), MP_ROM_PTR(&pin_GPIO21) },
26+
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO21) },
27+
28+
{ MP_ROM_QSTR(MP_QSTR_GPIO22), MP_ROM_PTR(&pin_GPIO22) },
29+
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO22) },
30+
{ MP_ROM_QSTR(MP_QSTR_SDA6),MP_ROM_PTR(&pin_GPIO22) },
31+
32+
{ MP_ROM_QSTR(MP_QSTR_GPIO23), MP_ROM_PTR(&pin_GPIO23) },
33+
{ MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO23) },
34+
{ MP_ROM_QSTR(MP_QSTR_SCL6),MP_ROM_PTR(&pin_GPIO23) },
35+
36+
{ MP_ROM_QSTR(MP_QSTR_GPIO6), MP_ROM_PTR(&pin_GPIO6) },
37+
{ MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO6) },
38+
{ MP_ROM_QSTR(MP_QSTR_SDA4),MP_ROM_PTR(&pin_GPIO6) },
39+
40+
{ MP_ROM_QSTR(MP_QSTR_GPIO7), MP_ROM_PTR(&pin_GPIO7) },
41+
{ MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO7) },
42+
{ MP_ROM_QSTR(MP_QSTR_SCL4),MP_ROM_PTR(&pin_GPIO7) },
43+
{ MP_ROM_QSTR(MP_QSTR_SPI0_CE1),MP_ROM_PTR(&pin_GPIO7) },
44+
45+
{ MP_ROM_QSTR(MP_QSTR_GPIO8), MP_ROM_PTR(&pin_GPIO8) },
46+
{ MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO8) },
47+
{ MP_ROM_QSTR(MP_QSTR_SPI0_CE0),MP_ROM_PTR(&pin_GPIO8) },
48+
49+
{ MP_ROM_QSTR(MP_QSTR_GPIO10), MP_ROM_PTR(&pin_GPIO10) },
50+
{ MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO10) },
51+
{ MP_ROM_QSTR(MP_QSTR_SPI0_MOSI),MP_ROM_PTR(&pin_GPIO10) },
52+
53+
{ MP_ROM_QSTR(MP_QSTR_GPIO9), MP_ROM_PTR(&pin_GPIO9) },
54+
{ MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO9) },
55+
{ MP_ROM_QSTR(MP_QSTR_SPI0_MISO),MP_ROM_PTR(&pin_GPIO9) },
56+
57+
{ MP_ROM_QSTR(MP_QSTR_GPIO11), MP_ROM_PTR(&pin_GPIO11) },
58+
{ MP_ROM_QSTR(MP_QSTR_D13),MP_ROM_PTR(&pin_GPIO11) },
59+
{ MP_ROM_QSTR(MP_QSTR_SPI0_SCLK),MP_ROM_PTR(&pin_GPIO11) },
60+
61+
{ MP_ROM_QSTR(MP_QSTR_SDA),MP_ROM_PTR(&pin_GPIO2) },
62+
{ MP_ROM_QSTR(MP_QSTR_SDA1),MP_ROM_PTR(&pin_GPIO2) },
63+
{ MP_ROM_QSTR(MP_QSTR_SCL),MP_ROM_PTR(&pin_GPIO3) },
64+
65+
{ MP_ROM_QSTR(MP_QSTR_GPIO12), MP_ROM_PTR(&pin_GPIO12) },
66+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO12) },
67+
68+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
69+
{ MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)},
70+
};
71+
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2021 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+
30+
#include "bindings/videocore/Framebuffer.h"
31+
#include "shared-module/displayio/__init__.h"
32+
#include "shared-bindings/framebufferio/FramebufferDisplay.h"
33+
34+
void board_init(void) {
35+
videocore_framebuffer_obj_t *fb = &allocate_display_bus()->videocore;
36+
fb->base.type = &videocore_framebuffer_type;
37+
common_hal_videocore_framebuffer_construct(fb, 640, 480);
38+
39+
framebufferio_framebufferdisplay_obj_t *display = &displays[0].framebuffer_display;
40+
display->base.type = &framebufferio_framebufferdisplay_type;
41+
common_hal_framebufferio_framebufferdisplay_construct(
42+
display,
43+
MP_OBJ_FROM_PTR(fb),
44+
0,
45+
true);
46+
}
47+
48+
bool board_requests_safe_mode(void) {
49+
return false;
50+
}
51+
52+
void reset_board(void) {
53+
}
54+
55+
void board_deinit(void) {
56+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#define MICROPY_HW_BOARD_NAME "Raspberry Pi Zero"
2+
3+
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO3)
4+
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO2)
5+
6+
#define MICROPY_HW_LED_STATUS (&pin_GPIO47)
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
USB_VID = 0x2E8A
2+
USB_PID = 0x100E
3+
USB_PRODUCT = "Zero"
4+
USB_MANUFACTURER = "Raspberry Pi"
5+
6+
CHIP_VARIANT = "bcm2835"
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
#include "shared-bindings/board/__init__.h"
2+
3+
#include "shared-module/displayio/__init__.h"
4+
5+
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
6+
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
7+
// These match the names used in Blinka
8+
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) },
9+
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO1) },
10+
11+
{ MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) },
12+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO2) },
13+
{ MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) },
14+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO3) },
15+
16+
{ MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
17+
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
18+
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
19+
20+
{ MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
21+
{ MP_ROM_QSTR(MP_QSTR_CE1), MP_ROM_PTR(&pin_GPIO7) },
22+
{ MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) },
23+
{ MP_ROM_QSTR(MP_QSTR_CE0), MP_ROM_PTR(&pin_GPIO8) },
24+
{ MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
25+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO9) },
26+
{ MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
27+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO10) },
28+
{ MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
29+
{ MP_ROM_QSTR(MP_QSTR_SCLK), MP_ROM_PTR(&pin_GPIO11) },
30+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO11) },
31+
32+
{ MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
33+
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
34+
35+
{ MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14) },
36+
{ MP_ROM_QSTR(MP_QSTR_TXD), MP_ROM_PTR(&pin_GPIO14) },
37+
{ MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15) },
38+
{ MP_ROM_QSTR(MP_QSTR_RXD), MP_ROM_PTR(&pin_GPIO15) },
39+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO14) },
40+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO15) },
41+
42+
{ MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) },
43+
{ MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) },
44+
{ MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18) },
45+
{ MP_ROM_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO19) },
46+
{ MP_ROM_QSTR(MP_QSTR_MISO_1), MP_ROM_PTR(&pin_GPIO19) },
47+
{ MP_ROM_QSTR(MP_QSTR_D20), MP_ROM_PTR(&pin_GPIO20) },
48+
{ MP_ROM_QSTR(MP_QSTR_MOSI_1), MP_ROM_PTR(&pin_GPIO20) },
49+
{ MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21) },
50+
{ MP_ROM_QSTR(MP_QSTR_SCLK_1), MP_ROM_PTR(&pin_GPIO21) },
51+
{ MP_ROM_QSTR(MP_QSTR_SCK_1), MP_ROM_PTR(&pin_GPIO21) },
52+
{ MP_ROM_QSTR(MP_QSTR_D22), MP_ROM_PTR(&pin_GPIO22) },
53+
{ MP_ROM_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO23) },
54+
{ MP_ROM_QSTR(MP_QSTR_D24), MP_ROM_PTR(&pin_GPIO24) },
55+
{ MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) },
56+
{ MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26) },
57+
{ MP_ROM_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_GPIO27) },
58+
59+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
60+
{ MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)},
61+
};
62+
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
USB_VID = 0x2E8A
2-
USB_PID = 0xf015
3-
USB_PRODUCT = "Raspberry Pi Zero"
2+
USB_PID = 0x101E
3+
USB_PRODUCT = "Zero W"
44
USB_MANUFACTURER = "Raspberry Pi"
55

66
CHIP_VARIANT = "bcm2835"

ports/broadcom/mpconfigport.mk

Lines changed: 14 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,26 @@
11
# All broadcom ports have longints.
22
LONGINT_IMPL = MPZ
33

4-
# Typically the first module to create
5-
CIRCUITPY_MICROCONTROLLER = 1
6-
# Typically the second module to create
7-
CIRCUITPY_DIGITALIO = 1
8-
# Other modules:
4+
CIRCUITPY_FULL_BUILD = 1
5+
6+
# Modules in FULL_BUILD that we don't support.
97
CIRCUITPY_ANALOGIO = 0
10-
CIRCUITPY_BUSIO = 1
11-
CIRCUITPY_ONEWIREIO = 0
12-
CIRCUITPY_PWMIO = 0
13-
CIRCUITPY_COUNTIO = 0
14-
CIRCUITPY_NEOPIXEL_WRITE = 1
15-
CIRCUITPY_PULSEIO = 0
16-
CIRCUITPY_OS = 1
17-
CIRCUITPY_NVM = 0
188
CIRCUITPY_AUDIOBUSIO = 0
199
CIRCUITPY_AUDIOIO = 0
20-
CIRCUITPY_ROTARYIO = 0
21-
CIRCUITPY_RTC = 0
22-
CIRCUITPY_SDCARDIO = 0
23-
CIRCUITPY_SDIOIO = 1
24-
CIRCUITPY_FRAMEBUFFERIO = 1
10+
CIRCUITPY_COUNTIO = 0
2511
CIRCUITPY_FREQUENCYIO = 0
2612
CIRCUITPY_I2CPERIPHERAL = 0
27-
# Requires SPI, PulseIO (stub ok):
28-
CIRCUITPY_DISPLAYIO = 1
29-
30-
# These modules are implemented in shared-module/ - they can be included in
31-
# any port once their prerequisites in common-hal are complete.
32-
# Requires DigitalIO:
33-
CIRCUITPY_BITBANGIO = 1
34-
# Requires DigitalIO
35-
CIRCUITPY_GAMEPAD = 0
36-
# Requires neopixel_write or SPI (dotstar)
37-
CIRCUITPY_PIXELBUF = 1
38-
# Requires OS
39-
CIRCUITPY_RANDOM = 1
40-
# Requires OS, filesystem
41-
CIRCUITPY_STORAGE = 1
42-
# Requires Microcontroller
43-
CIRCUITPY_TOUCHIO = 0
44-
# Requires USB
45-
CIRCUITPY_USB = 1
46-
CIRCUITPY_USB_MSC = 1
47-
CIRCUITPY_USB_HID = 1
48-
CIRCUITPY_USB_MIDI = 1
49-
USB_NUM_ENDPOINT_PAIRS = 8
50-
# Does nothing without I2C
51-
CIRCUITPY_REQUIRE_I2C_PULLUPS = 0
52-
# No requirements, but takes extra flash
53-
CIRCUITPY_ULAB = 0
13+
CIRCUITPY_NVM = 0
14+
CIRCUITPY_PARALLELDISPLAY = 0
15+
CIRCUITPY_PULSEIO = 0
16+
CIRCUITPY_PWMIO = 0
17+
CIRCUITPY_ROTARYIO = 0
18+
CIRCUITPY_RTC = 0
5419

20+
CIRCUITPY_SDIOIO = 1
5521
CIRCUITPY_VIDEOCORE = 1
5622

57-
CIRCUITPY_ERRNO = 0
58-
59-
CIRCUITPY_FULL_BUILD = 0
60-
6123
INTERNAL_FLASH_FILESYSTEM = 1
24+
25+
USB_NUM_ENDPOINT_PAIRS = 8
26+
USB_HIGHSPEED = 1

0 commit comments

Comments
 (0)