Skip to content

Commit 8ad00bb

Browse files
committed
working on being able to share the SPI Bus
1 parent a86fcf3 commit 8ad00bb

File tree

4 files changed

+18
-9
lines changed

4 files changed

+18
-9
lines changed

.github/workflows/macOS.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,17 @@ jobs:
1010

1111
steps:
1212
- uses: actions/checkout@v4
13+
- uses: carlosperate/[email protected]
14+
with:
15+
release: '9-2020-q2' # The arm-none-eabi-gcc release to use.
16+
1317
- uses: actions/setup-python@v5
1418
with:
1519
python-version: '3.10'
1620

1721
- name: Install Dependencies
1822
run: |
19-
brew install --force ninja armmbed/formulae/arm-none-eabi-gcc
23+
brew install --force ninja
2024
2125
- name: Cached Deps
2226
id: cache-deps

.github/workflows/unix.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,17 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v4
16+
17+
- uses: carlosperate/[email protected]
18+
with:
19+
release: '9-2020-q2' # The arm-none-eabi-gcc release to use.
20+
1621
- uses: actions/setup-python@v5
1722
with:
1823
python-version: '3.10'
1924

2025
- name: Install Deps
21-
run: sudo apt-get update && sudo apt-get install --assume-yes --allow-downgrades --allow-remove-essential --allow-change-held-packages build-essential pkg-config cmake ninja-build libffi-dev gnome-desktop-testing libasound2-dev libpulse-dev libaudio-dev libjack-dev libsndio-dev libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev libpipewire-0.3-dev libwayland-dev libdecor-0-dev ccache gcc-arm-none-eabi libnewlib-arm-none-eabi
26+
run: sudo apt-get update && sudo apt-get install --assume-yes --allow-downgrades --allow-remove-essential --allow-change-held-packages build-essential pkg-config cmake ninja-build libffi-dev gnome-desktop-testing libasound2-dev libpulse-dev libaudio-dev libjack-dev libsndio-dev libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev libpipewire-0.3-dev libwayland-dev libdecor-0-dev ccache
2227

2328
- name: Cached Deps
2429
id: cache-deps

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ Compiling for RP2
135135
Compiling for STM32:
136136
* Ubuntu (Linux): you can install all of these using `apt-get install`
137137
* gcc-arm-none-eabi
138-
* libnewlib-arm-none-eabi
138+
* libnewlib-arm-none-eabi: maybe??
139139
* build-essential
140140
* ninja-build
141141
* python

micropy_updates/rp2/machine_spi.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,16 +128,16 @@ typedef struct _machine_hw_spi_obj_t {
128128
static machine_hw_spi_bus_obj_t machine_spi_bus_obj[] = {
129129
{
130130
0,
131-
mp_obj_new_int_from_uint(MICROPY_HW_SPI0_SCK),
132-
mp_obj_new_int_from_uint(MICROPY_HW_SPI0_MOSI),
133-
mp_obj_new_int_from_uint(MICROPY_HW_SPI0_MISO),
131+
(const mp_obj_t)mp_obj_new_int_from_uint(MICROPY_HW_SPI0_SCK),
132+
(const mp_obj_t)mp_obj_new_int_from_uint(MICROPY_HW_SPI0_MOSI),
133+
(const mp_obj_t)mp_obj_new_int_from_uint(MICROPY_HW_SPI0_MISO),
134134
0, 0, (const void *)spi0
135135
},
136136
{
137137
1,
138-
mp_obj_new_int_from_uint(MICROPY_HW_SPI1_SCK),
139-
mp_obj_new_int_from_uint(MICROPY_HW_SPI1_MOSI),
140-
mp_obj_new_int_from_uint(MICROPY_HW_SPI1_MISO),
138+
(const mp_obj_t)mp_obj_new_int_from_uint(MICROPY_HW_SPI1_SCK),
139+
(const mp_obj_t)mp_obj_new_int_from_uint(MICROPY_HW_SPI1_MOSI),
140+
(const mp_obj_t)mp_obj_new_int_from_uint(MICROPY_HW_SPI1_MISO),
141141
0, 0, (const void *)spi1
142142
},
143143
};

0 commit comments

Comments
 (0)