Skip to content

Commit f7758da

Browse files
committed
bricks/ev3dev: Goodbye.
Thank you, David! Pybricks for ev3dev will continue to be alive and kicking in its original 2.0 form. Since updating to 3.0 and 4.0 is not considered feasible, we are dropping this build to streamline the addition of the upcoming bare metal EV3 port.
1 parent f3895c9 commit f7758da

File tree

101 files changed

+2
-8267
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+2
-8267
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -83,94 +83,6 @@ jobs:
8383
if: failure()
8484
run: micropython/tests/run-tests.py --print-failures
8585

86-
ev3dev_stretch:
87-
name: ev3dev-stretch
88-
runs-on: ubuntu-22.04
89-
steps:
90-
- name: Docker login
91-
uses: azure/docker-login@v1
92-
with:
93-
login-server: docker.pkg.github.com
94-
username: ${{ github.actor }}
95-
password: ${{ secrets.GITHUB_TOKEN }}
96-
- name: Install QEMU
97-
run: |
98-
sudo apt-get update
99-
sudo apt-get install qemu-user-static
100-
- name: Checkout repo
101-
uses: actions/checkout@v4
102-
with:
103-
submodules: true
104-
fetch-depth: 0
105-
- name: Create docker container
106-
run: bricks/ev3dev/docker/setup.sh armel
107-
- name: Build
108-
run: |
109-
docker exec --tty pybricks-ev3dev_armel make -C ../../micropython/mpy-cross CROSS_COMPILE=
110-
docker exec --tty pybricks-ev3dev_armel make
111-
- name: Test
112-
if: ${{ success() }}
113-
run: |
114-
docker exec --tty pybricks-ev3dev_armel make test-ev3dev
115-
- name: List failed tests
116-
if: failure()
117-
run: micropython/tests/run-tests.py --print-failures
118-
- name: Short hash
119-
id: vars
120-
run: echo "short_sha=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_OUTPUT
121-
- name: Upload pybricks-micropython
122-
if: ${{ success() }}
123-
uses: actions/upload-artifact@v4
124-
with:
125-
name: pybricks-micropython-build-${{ github.run_number }}-git${{ steps.vars.outputs.short_sha }}
126-
path: bricks/ev3dev/build-armel/pybricks-micropython
127-
128-
ev3dev_ubuntu_lts:
129-
name: ev3dev-ubuntu-lts
130-
needs: mpy_cross
131-
runs-on: ubuntu-22.04
132-
env:
133-
CROSS_COMPILE: ""
134-
steps:
135-
- name: Install rerequisites
136-
run: |
137-
sudo apt-add-repository --update --yes ppa:ev3dev/tools
138-
sudo apt-get install --no-install-recommends --yes \
139-
alsa-utils \
140-
espeak \
141-
ev3dev-media \
142-
ev3dev-mocks \
143-
libasound2-plugin-ev3dev \
144-
libffi-dev \
145-
libgrx-3.0-dev \
146-
libi2c-dev \
147-
libudev-dev \
148-
libumockdev0 \
149-
pkg-config \
150-
uthash-dev \
151-
xfonts-100dpi
152-
- name: Checkout repo
153-
uses: actions/checkout@v4
154-
with:
155-
submodules: true
156-
- name: Download mpy-cross
157-
uses: actions/download-artifact@v4
158-
with:
159-
name: mpy-cross
160-
path: micropython/mpy-cross/build
161-
- name: Fix file permission
162-
run: chmod +x micropython/mpy-cross/build/mpy-cross
163-
- name: Build
164-
run: make $MAKEOPTS -C bricks/ev3dev
165-
- name: Test
166-
if: ${{ success() }}
167-
run: |
168-
make $MAKEOPTS -C bricks/ev3dev test
169-
make $MAKEOPTS -C bricks/ev3dev test-ev3dev
170-
- name: List failed tests
171-
if: failure()
172-
run: micropython/tests/run-tests.py --print-failures
173-
17486
firmware:
17587
name: firmware
17688
strategy:

.vscode/c_cpp_properties.json

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -333,37 +333,6 @@
333333
"cStandard": "c11",
334334
"intelliSenseMode": "gcc-arm"
335335
},
336-
{
337-
"name": "ev3dev",
338-
"includePath": [
339-
"/usr/lib/x86_64-linux-gnu/glib-2.0/include",
340-
"/usr/include/glib-2.0",
341-
"${workspaceFolder}/bricks/ev3dev",
342-
"${workspaceFolder}/bricks/ev3dev/build",
343-
"${workspaceFolder}/lib/contiki-core",
344-
"${workspaceFolder}/lib/ev3dev/include",
345-
"${workspaceFolder}/lib/lego",
346-
"${workspaceFolder}/lib/lwrb/src/include",
347-
"${workspaceFolder}/lib/pbio",
348-
"${workspaceFolder}/lib/pbio/include",
349-
"${workspaceFolder}/lib/pbio/platform/ev3dev_stretch",
350-
"${workspaceFolder}/micropython/ports/unix",
351-
"${workspaceFolder}/micropython",
352-
"${workspaceFolder}"
353-
],
354-
"defines": [
355-
"UNIX",
356-
"MICROPY_USE_READLINE=1",
357-
"MICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool",
358-
"MICROPY_MODULE_FROZEN_MPY",
359-
"MPZ_DIG_SIZE=16",
360-
"MICROPY_MODULE_FROZEN_STR"
361-
362-
],
363-
"compilerPath": "/usr/bin/gcc",
364-
"cStandard": "c11",
365-
"intelliSenseMode": "gcc-x64"
366-
},
367336
{
368337
"name": "virtualhub",
369338
"includePath": [

.vscode/launch.json

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,6 @@
3333
"args": ["${file}", "--show"],
3434
"console": "integratedTerminal"
3535
},
36-
{
37-
"name": "Motor Test EV3",
38-
"type": "python",
39-
"request": "launch",
40-
"program": "${workspaceFolder}/tests/motors/run_test.py",
41-
"args": ["${file}", "--target", "ev3dev", "--address", "192.168.133.244", "--show"],
42-
"console": "integratedTerminal"
43-
},
4436
{
4537
"name": "Run via USB REPL",
4638
"type": "python",
@@ -61,44 +53,6 @@
6153
"args": [],
6254
"console": "integratedTerminal"
6355
},
64-
{
65-
"name": "ev3dev-test",
66-
"type": "cppdbg",
67-
"request": "launch",
68-
"cwd": "${workspaceFolder}/micropython/tests",
69-
"program": "${workspaceFolder}/bricks/ev3dev/build-test/pybricks-micropython",
70-
"args": [
71-
"../../tests/ev3dev/brick/battery.py"
72-
],
73-
"stopAtEntry": false,
74-
"environment": [
75-
{"name": "GRX_PLUGIN_PATH", "value": "../../bricks/ev3dev/build-test"},
76-
{"name": "GRX_DRIVER", "value": "test"}
77-
],
78-
"externalConsole": true,
79-
"MIMode": "gdb",
80-
"setupCommands": [
81-
{
82-
"description": "Enable pretty-printing for gdb",
83-
"text": "-enable-pretty-printing",
84-
"ignoreFailures": true
85-
},
86-
{
87-
"description": "ignore SIGUSR1",
88-
"text": "handle SIGUSR1 noprint pass"
89-
},
90-
{
91-
"description": "ignore SIGUSR2",
92-
"text": "handle SIGUSR2 noprint pass"
93-
},
94-
{
95-
"description": "ignore SIGRT39",
96-
"text": "handle SIGUSR2 noprint pass"
97-
}
98-
],
99-
"logging": { "engineLogging": true, "trace": true, "traceResponse": true },
100-
"preLaunchTask": "build ev3dev-test"
101-
},
10256
{
10357
"name": "virtualhub",
10458
"type": "cppdbg",
@@ -182,21 +136,6 @@
182136
"searchDir": [
183137
"${workspaceRoot}/bricks/debug"
184138
]
185-
},
186-
{
187-
"name": "(gdb) Attach",
188-
"type": "cppdbg",
189-
"request": "attach",
190-
"program": "${workspaceFolder}/bricks/ev3dev/built-test/pybricks-micropython",
191-
"processId": "${command:pickProcess}",
192-
"MIMode": "gdb",
193-
"setupCommands": [
194-
{
195-
"description": "Enable pretty-printing for gdb",
196-
"text": "-enable-pretty-printing",
197-
"ignoreFailures": true
198-
}
199-
]
200139
}
201140
],
202141
"inputs": [

.vscode/tasks.json

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,6 @@
33
// for the documentation about the tasks.json format
44
"version": "2.0.0",
55
"tasks": [
6-
{
7-
"label": "build ev3dev-test",
8-
"type": "shell",
9-
"command": "poetry run make -C bricks/ev3dev build-test/pybricks-micropython build-test/libgrx-3.0-vdriver-test.so DEBUG=1 COPT=-O0 BUILD=build-test CROSS_COMPILE= -j"
10-
},
11-
{
12-
"label": "build ev3dev deploy",
13-
"type": "shell",
14-
"command": "make ev3dev-armel -j && cp bricks/ev3dev/build-armel/pybricks-micropython /run/user/1000/gvfs/sftp:host=*/home/robot"
15-
},
166
{
177
"label": "build movehub",
188
"type": "shell",

Makefile

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -32,38 +32,6 @@ all: movehub cityhub technichub primehub essentialhub virtualhub nxt debug ev3 d
3232

3333
clean-all: clean-movehub clean-cityhub clean-technichub clean-primehub clean-essentialhub clean-virtualhub clean-nxt clean-debug clean-ev3 clean-doc
3434

35-
ifeq ($(HOST_OS),Linux)
36-
37-
ev3dev-host: mpy-cross
38-
@$(MAKE) -C bricks/ev3dev CROSS_COMPILE=
39-
40-
clean-ev3dev-host: clean-mpy-cross
41-
@$(MAKE) -C bricks/ev3dev clean CROSS_COMPILE=
42-
43-
else
44-
45-
ev3dev-host:
46-
$(error Building ev3dev for host OS only works on Linux)
47-
48-
clean-ev3dev-host: ev3dev-host
49-
50-
endif
51-
52-
ev3dev-armel:
53-
@if [ ! -d bricks/ev3dev/build-armel/ports ]; then \
54-
bricks/ev3dev/docker/setup.sh armel; \
55-
fi
56-
@docker start pybricks-ev3dev_armel
57-
@docker exec --tty pybricks-ev3dev_armel make -C ../../micropython/mpy-cross CROSS_COMPILE= -j`nproc`
58-
@docker exec --tty pybricks-ev3dev_armel make -j`nproc`
59-
60-
clean-ev3dev-armel:
61-
@if [ -d bricks/ev3dev/build-armel/ports ]; then \
62-
@docker start pybricks-ev3dev_armel; \
63-
docker exec --tty pybricks-ev3dev_armel make -C ../../micropython/mpy-cross clean CROSS_COMPILE=; \
64-
docker exec --tty pybricks-ev3dev_armel make clean; \
65-
fi
66-
6735
ev3: mpy-cross
6836
@$(MAKE) -C bricks/ev3
6937

bricks/_common/mpconfigport.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
// REVISIT: This file is still largely focused on embedded MicroPython ports.
77
// Further generalization and possibly a higher option set are needed to use
8-
// this with unix-based ports like the virtual hub or ev3dev.
8+
// this with unix-based ports like the virtual hub.
99

1010
#include <stdint.h>
1111
#include <pbdrv/config.h>

bricks/_common/sources.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ PYBRICKS_PYBRICKS_SRC_C = $(addprefix pybricks/,\
5757
hubs/pb_type_virtualhub.c \
5858
iodevices/pb_module_iodevices.c \
5959
iodevices/pb_type_iodevices_analogsensor.c \
60-
iodevices/pb_type_iodevices_ev3devsensor.c \
6160
iodevices/pb_type_iodevices_i2cdevice.c \
6261
iodevices/pb_type_iodevices_lwp3device.c \
6362
iodevices/pb_type_iodevices_pupdevice.c \
@@ -107,7 +106,6 @@ PYBRICKS_PYBRICKS_SRC_C = $(addprefix pybricks/,\
107106
util_pb/pb_color_map.c \
108107
util_pb/pb_conversions.c \
109108
util_pb/pb_error.c \
110-
util_pb/pb_serial_ev3dev.c \
111109
)
112110

113111
# Pybricks I/O library
@@ -146,7 +144,6 @@ PBIO_SRC_C = $(addprefix lib/pbio/,\
146144
drv/clock/clock_tiam1808.c \
147145
drv/clock/clock_virtual.c \
148146
drv/core.c \
149-
drv/counter/counter_ev3dev_stretch_iio.c \
150147
drv/counter/counter_stm32f0_gpio_quad_enc.c \
151148
drv/counter/counter_virtual_cpython.c \
152149
drv/gpio/gpio_stm32f0.c \
@@ -161,14 +158,12 @@ PBIO_SRC_C = $(addprefix lib/pbio/,\
161158
drv/led/led_dual.c \
162159
drv/led/led_pwm.c \
163160
drv/led/led_virtual.c \
164-
drv/legodev/legodev_ev3dev.c \
165161
drv/legodev/legodev_nxt.c \
166162
drv/legodev/legodev_pup.c \
167163
drv/legodev/legodev_pup_uart.c \
168164
drv/legodev/legodev_spec.c \
169165
drv/legodev/legodev_test.c \
170166
drv/legodev/legodev_virtual.c \
171-
drv/motor_driver/motor_driver_ev3dev_stretch.c \
172167
drv/motor_driver/motor_driver_hbridge_pwm.c \
173168
drv/motor_driver/motor_driver_nxt.c \
174169
drv/motor_driver/motor_driver_virtual_cpython.c \

bricks/cityhub/mpconfigport.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
#define PYBRICKS_PY_IODEVICES (1)
3333
#define PYBRICKS_PY_IODEVICES_XBOX_CONTROLLER (0)
3434
#define PYBRICKS_PY_MEDIA (0)
35-
#define PYBRICKS_PY_MEDIA_EV3DEV (0)
3635
#define PYBRICKS_PY_NXTDEVICES (0)
3736
#define PYBRICKS_PY_PARAMETERS (1)
3837
#define PYBRICKS_PY_PARAMETERS_BUTTON (1)

bricks/debug/mpconfigport.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#define PYBRICKS_PY_HUBS (0)
2929
#define PYBRICKS_PY_IODEVICES (0)
3030
#define PYBRICKS_PY_MEDIA (0)
31-
#define PYBRICKS_PY_MEDIA_EV3DEV (0)
3231
#define PYBRICKS_PY_NXTDEVICES (0)
3332
#define PYBRICKS_PY_PARAMETERS (1)
3433
#define PYBRICKS_PY_PARAMETERS_BUTTON (1)

bricks/essentialhub/mpconfigport.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#define PYBRICKS_PY_IODEVICES (1)
3434
#define PYBRICKS_PY_IODEVICES_XBOX_CONTROLLER (1)
3535
#define PYBRICKS_PY_MEDIA (0)
36-
#define PYBRICKS_PY_MEDIA_EV3DEV (0)
3736
#define PYBRICKS_PY_NXTDEVICES (0)
3837
#define PYBRICKS_PY_PARAMETERS (1)
3938
#define PYBRICKS_PY_PARAMETERS_BUTTON (1)

0 commit comments

Comments
 (0)