Skip to content

Commit 6227e63

Browse files
hierophecthierophect
committed
Merge remote-tracking branch 'upstream/master' into stm32x7-setup
2 parents 5ac38c9 + 76f3aa4 commit 6227e63

30 files changed

Lines changed: 271 additions & 42 deletions

‎.github/workflows/build.yml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ jobs:
1616
env:
1717
GITHUB_CONTEXT: ${{ toJson(github) }}
1818
run: echo "$GITHUB_CONTEXT"
19-
- name: Set up Python 3.5
19+
- name: Set up Python 3.8
2020
uses: actions/setup-python@v1
2121
with:
22-
python-version: 3.5
22+
python-version: 3.8
2323
- name: Install deps
2424
run: |
2525
sudo apt-get install -y eatmydata
2626
sudo eatmydata apt-get install -y gettext librsvg2-bin mingw-w64
27-
pip install requests sh click setuptools cpp-coveralls Sphinx sphinx-rtd-theme recommonmark sphinxcontrib-svg2pdfconverter polib pyyaml
27+
pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinxcontrib-svg2pdfconverter polib pyyaml
2828
- name: Versions
2929
run: |
3030
gcc --version
@@ -42,7 +42,7 @@ jobs:
4242
make -C ports/unix -j2
4343
make -C ports/unix coverage -j2
4444
- name: Test all
45-
run: MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1
45+
run: MICROPY_CPYTHON3=python3.8 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1
4646
working-directory: tests
4747
- name: Print failure info
4848
run: |
@@ -54,10 +54,10 @@ jobs:
5454
working-directory: tests
5555
if: failure()
5656
- name: Native Tests
57-
run: MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native
57+
run: MICROPY_CPYTHON3=python3.8 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native
5858
working-directory: tests
5959
- name: mpy Tests
60-
run: MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --via-mpy -d basics float
60+
run: MICROPY_CPYTHON3=python3.8 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --via-mpy -d basics float
6161
working-directory: tests
6262
- name: Docs
6363
run: sphinx-build -E -W -b html . _build/html
@@ -189,6 +189,7 @@ jobs:
189189
- "mini_sam_m4"
190190
- "monster_m4sk"
191191
- "ndgarage_ndbit6"
192+
- "nfc_copy_cat"
192193
- "nucleo_f767zi"
193194
- "nucleo_h743zi_2"
194195
- "ohs2020_badge"
@@ -246,10 +247,10 @@ jobs:
246247
- "xinabox_cs11"
247248

248249
steps:
249-
- name: Set up Python 3.5
250+
- name: Set up Python 3.8
250251
uses: actions/setup-python@v1
251252
with:
252-
python-version: 3.5
253+
python-version: 3.8
253254
- name: Install deps
254255
run: |
255256
sudo apt-get install -y gettext
@@ -292,10 +293,10 @@ jobs:
292293
- "fomu"
293294

294295
steps:
295-
- name: Set up Python 3.5
296+
- name: Set up Python 3.8
296297
uses: actions/setup-python@v1
297298
with:
298-
python-version: 3.5
299+
python-version: 3.8
299300
- name: Install deps
300301
run: |
301302
sudo apt-get install -y gettext
@@ -326,4 +327,4 @@ jobs:
326327
env:
327328
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
328329
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
329-
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
330+
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))

‎.github/workflows/create_website_pr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
env:
1313
GITHUB_CONTEXT: ${{ toJson(github) }}
1414
run: echo "$GITHUB_CONTEXT"
15-
- name: Set up Python 3.5
15+
- name: Set up Python 3.8
1616
uses: actions/setup-python@v1
1717
with:
18-
python-version: 3.5
18+
python-version: 3.8
1919
- name: Install deps
2020
run: |
2121
pip install requests sh click

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
url = https://github.com/adafruit/Adafruit_CircuitPython_Register.git
110110
[submodule "extmod/ulab"]
111111
path = extmod/ulab
112-
url = https://github.com/v923z/micropython-ulab/
112+
url = https://github.com/v923z/micropython-ulab
113113
[submodule "frozen/Adafruit_CircuitPython_ESP32SPI"]
114114
path = frozen/Adafruit_CircuitPython_ESP32SPI
115115
url = https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI

‎conf.py‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import sys
1818
import os
1919

20-
from recommonmark.parser import CommonMarkParser
20+
import recommonmark
2121

2222
# If extensions (or modules to document with autodoc) are in another directory,
2323
# add these directories to sys.path here. If the directory is relative to the
@@ -55,16 +55,20 @@
5555
'sphinx.ext.todo',
5656
'sphinx.ext.coverage',
5757
'rstjinja',
58-
'c2rst'
58+
'c2rst',
59+
'recommonmark',
5960
]
6061

6162
# Add any paths that contain templates here, relative to this directory.
6263
templates_path = ['templates']
6364

6465
# The suffix of source filenames.
65-
source_suffix = ['.rst', '.md', '.c', '.h']
66+
source_suffix = {
67+
'.rst': 'restructuredtext',
68+
'.md': 'markdown',
69+
'.c': ''
70+
}
6671

67-
source_parsers = {'.md': CommonMarkParser}
6872

6973
# The encoding of source files.
7074
#source_encoding = 'utf-8-sig'
@@ -358,4 +362,4 @@
358362
"register": ('https://circuitpython.readthedocs.io/projects/register/en/latest/', None)}
359363

360364
def setup(app):
361-
app.add_stylesheet("customstyle.css")
365+
app.add_css_file("customstyle.css")

‎docs/library/network.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ Methods
247247
nic.ifconfig(('192.168.0.4', '255.255.255.0', '192.168.0.1', '8.8.8.8'))
248248

249249
.. method:: wlan.config('param')
250-
.. method:: wlan.config(param=value, ...)
250+
wlan.config(param=value, ...)
251251

252252
Get or set general network interface parameters. These methods allow to work
253253
with additional parameters beyond standard IP configuration (as dealt with by

‎ports/atmel-samd/boards/nfc_copy_cat/board.c‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2017 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 "boards/board.h"
28+
29+
void board_init(void)
30+
{
31+
}
32+
33+
bool board_requests_safe_mode(void) {
34+
return false;
35+
}
36+
37+
void reset_board(void) {
38+
}

‎ports/atmel-samd/boards/nfc_copy_cat/mpconfigboard.h‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
#define MICROPY_HW_BOARD_NAME "Electronic Cats NFC Copy Cat"
2+
#define MICROPY_HW_MCU_NAME "samd21e18"
3+
4+
#define MICROPY_HW_LED_STATUS (&pin_PA14)
5+
6+
#define MICROPY_PORT_A (0)
7+
#define MICROPY_PORT_B (0)
8+
#define MICROPY_PORT_C (0)
9+
10+
#define SPI_FLASH_MOSI_PIN &pin_PA08
11+
#define SPI_FLASH_MISO_PIN &pin_PA11
12+
#define SPI_FLASH_SCK_PIN &pin_PA09
13+
#define SPI_FLASH_CS_PIN &pin_PA10
14+
15+
// No microcontroller.nvm
16+
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
17+
18+
#define DEFAULT_SPI_BUS_SCK (&pin_PA17)
19+
#define DEFAULT_SPI_BUS_MOSI (&pin_PA16)
20+
#define DEFAULT_SPI_BUS_MISO (&pin_PA19)
21+
22+
#define IGNORE_PIN_PA03 1
23+
#define IGNORE_PIN_PA20 1
24+
#define IGNORE_PIN_PA21 1
25+
// USB is always used.
26+
#define IGNORE_PIN_PA24 1
27+
#define IGNORE_PIN_PA25 1
28+
#define IGNORE_PIN_PA30 1
29+
#define IGNORE_PIN_PA31 1
30+
#define IGNORE_PIN_PB01 1
31+
#define IGNORE_PIN_PB02 1
32+
#define IGNORE_PIN_PB03 1
33+
#define IGNORE_PIN_PB04 1
34+
#define IGNORE_PIN_PB05 1
35+
#define IGNORE_PIN_PB06 1
36+
#define IGNORE_PIN_PB07 1
37+
#define IGNORE_PIN_PB08 1
38+
#define IGNORE_PIN_PB09 1
39+
#define IGNORE_PIN_PB10 1
40+
#define IGNORE_PIN_PB11 1
41+
#define IGNORE_PIN_PB12 1
42+
#define IGNORE_PIN_PB13 1
43+
#define IGNORE_PIN_PB14 1
44+
#define IGNORE_PIN_PB15 1
45+
#define IGNORE_PIN_PB16 1
46+
#define IGNORE_PIN_PB17 1
47+
#define IGNORE_PIN_PB22 1
48+
#define IGNORE_PIN_PB23 1
49+
#define IGNORE_PIN_PB30 1
50+
#define IGNORE_PIN_PB31 1
51+
#define IGNORE_PIN_PB00 1

‎ports/atmel-samd/boards/nfc_copy_cat/mpconfigboard.mk‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
USB_VID = 0x1209
2+
USB_PID = 0xBAB8
3+
USB_PRODUCT = "NFC Copy Cat"
4+
USB_MANUFACTURER = "Electronic Cats"
5+
6+
CHIP_VARIANT = SAMD21E18A
7+
CHIP_FAMILY = samd21
8+
9+
SPI_FLASH_FILESYSTEM = 1
10+
EXTERNAL_FLASH_DEVICE_COUNT = 1
11+
EXTERNAL_FLASH_DEVICES = "GD25Q16C"
12+
LONGINT_IMPL = NONE
13+
14+
CIRCUITPY_SMALL_BUILD = 1

‎ports/atmel-samd/boards/nfc_copy_cat/pins.c‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#include "shared-bindings/board/__init__.h"
2+
3+
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4+
{ MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PA02) }, // IRQ
5+
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA06) }, // IN_A
6+
{ MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PA07) }, // IN_B
7+
{ MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA05) }, // LED
8+
{ MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PA04) }, // LED
9+
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_PA14) }, // LED
10+
{ MP_ROM_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_PA27) }, // Switch
11+
{ MP_ROM_QSTR(MP_QSTR_D28), MP_ROM_PTR(&pin_PA28) }, // Switch
12+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA08) },
13+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA09) },
14+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA17) },
15+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PA16) },
16+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PA19) },
17+
{ MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_PA18) }, // CS
18+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
19+
};
20+
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

‎ports/litex/boards/fomu/fomu-spi.ld‎

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,42 @@ SECTIONS
2626
. = ALIGN(4);
2727
_sdata = .; /* create a global symbol at data start; used by startup code in order to initialise the .data section in RAM */
2828

29-
*(.itcm.*) /* Instruction Tightly Coupled Memory */
30-
*(.dtcm_data.*) /* Data Tightly Coupled Memory */
29+
*(.itcm.*) /* Instruction Tightly Coupled Memory */
30+
*(.dtcm_data.*) /* Data Tightly Coupled Memory */
31+
32+
*(.text.cmp_lfn)
33+
*(.text.qstr_find_strn)
34+
*(.text.dcd_edpt_xfer)
35+
*(.text.pop_rule)
36+
*(.text.ff_wtoupper)
37+
*(.text.dir_find)
38+
*(.text.push_rule)
39+
*(.text.csr_writel)
40+
*(.text.csr_readl)
41+
*(.text.timer0_ev_pending_write)
42+
*(.text.autoreload_tick)
43+
*(.text.filesystem_tick)
44+
*(.text.usb_background)
45+
46+
*(.text.dcd_*)
47+
*(.text.tud_control_*)
48+
*(.text.tud_cdc_n_write_flush)
49+
*(.text.tud_task)
50+
*(.text.tu_edpt_dir)
51+
*(.text.tu_fifo_empty)
52+
*(.text.usbd_edpt_busy)
53+
*(.text.irq_getmask)
54+
*(.text.irq_setmask)
55+
*(.text.irq_pending)
56+
*(.text._osal_q_lock)
57+
*(.text.osal_queue_receive)
58+
59+
*(.text.mp_obj_get_type)
60+
*(.text.mp_parse)
61+
*(.text.parse_compile_execute)
62+
*(.text.mp_map_lookup)
63+
*(.text.mp_execute_bytecode) /* Note: this function is 7kb */
64+
3165
*(.ramtext) /* .text* sections (code) */
3266
*(.ramtext*) /* .text* sections (code) */
3367
*(.data) /* .data sections */
@@ -63,7 +97,7 @@ SECTIONS
6397
_sbss = .; /* define a global symbol at bss start; used by startup code */
6498
*(.bss)
6599
*(.bss*)
66-
*(.dtcm_bss.*) /* Data Tightly Coupled Memory */
100+
*(.dtcm_bss.*) /* Data Tightly Coupled Memory */
67101
*(.sbss)
68102
*(.sbss*)
69103
*(COMMON)

0 commit comments

Comments
 (0)