Skip to content

Commit ecfbc29

Browse files
WasabiFanWasabiFan
authored
Port fixes from 1.2.0 tag to stretch release branch; update EV3 port names; update debian metadata (#483)
- Port fixes from 1.2.0 tag to stretch release branch - Update EV3 port names - Update debian metadata and add release script
1 parent b25637f commit ecfbc29

File tree

6 files changed

+77
-145
lines changed

6 files changed

+77
-145
lines changed

‎debian/changelog

Lines changed: 3 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -1,121 +1,5 @@
1-
python-ev3dev (1.0.0) stable; urgency=medium
1+
python-ev3dev2 (2.0.0) stable; urgency=medium
22

3-
[Denis Demidov]
4-
* Add constants for color values to color sensor class
5-
* Update documentation on motors
6-
* Add getters to check state of motors
7-
* Implement BeaconSeeker class
8-
* Fix scaling of floating-point values from sensors
3+
Initial release for ev3dev-stretch.
94

10-
[Eric Pascual]
11-
* Add Sound.play_song method
12-
13-
[Stefan Sauer]
14-
* Make sound commands cancelable
15-
16-
[Maximilian Nöthe]
17-
* Add tuples for sensor modes
18-
19-
[Daniel Walton]
20-
* Add wait_until_not_moving for motors
21-
22-
-- Denis Demidov <[email protected]> Tue, 05 Sep 2017 16:50:20 +0300
23-
24-
python-ev3dev (0.8.1) stable; urgency=medium
25-
26-
[Kaelin Laundry]
27-
* Documentation updates
28-
29-
[Thomas Watson]
30-
* Use speed instead of duty cycle in EXPLOR3R/auto-drive.py
31-
32-
[Denis Demidov]
33-
* Provide Sound.set_volume(pct)
34-
* Implement Sound.get_volume()
35-
* Documentation updates
36-
37-
[Daniel Walton]
38-
* Documentation updates
39-
* Update utils to python3
40-
* Clean up MINDCUB3R demo
41-
42-
[Pepijn de Vos]
43-
* Check for non-existing device attributes
44-
45-
[Stefan Sauer]
46-
* Fix inverted button logic for the latest kernel
47-
48-
[@craigsammisutherland]
49-
* Added a function to list all the connected sensors
50-
51-
-- Denis Demidov <[email protected]> Mon, 06 Feb 2017 09:27:21 +0300
52-
53-
python-ev3dev (0.8.0) stable; urgency=medium
54-
55-
[Denis Demidov]
56-
* Add option to not set mode before reading sensor value
57-
* Return a tuple for multiple values from a sensor property
58-
* Add ColorSensor.raw() method to get all color channels at once
59-
* Merge NXTMotor functionality into LargeMotor class and remove NXTMotor
60-
* Distribute fonts from xfonts-75dpi in PIL format and expose them in
61-
code
62-
* Replace special sensor methods with properties for the sake of consistency
63-
(breaking change!)
64-
* Provide waiting functions for motors.
65-
* Make implementation of Led timer-based trigger more robust.
66-
67-
-- Denis Demidov <[email protected]> Thu, 03 Nov 2016 19:18:49 +0300
68-
69-
python-ev3dev (0.7.0) stable; urgency=medium
70-
71-
[Denis Demidov]
72-
* Support "-13-ev3dev" and newer kernels.
73-
* Rename FirgelliL1250Motor and FirgelliL12100Motor to ActuonixL1250Motor
74-
and ActuonixL12100Motor.
75-
* Allow passing espeak options to Sound.speak
76-
* Make sure that device classes connect to devices of the right
77-
type (driver name)
78-
* Fix fatal error due to calling an undefined function in
79-
some property setters, such as LED triggers
80-
81-
[Daniel Walton]
82-
* Add "__version__" property.
83-
* Add ev3dev/helper.py with classes for Tanks, Motors, Web UI, etc.
84-
* Add ev3dev/GyroBalancer.py for robots that use a gyroscope.
85-
86-
[Donald Webster]
87-
* Fix port names on BrickPi.
88-
89-
[Frank Busse]
90-
* Fix bad division logic in display classes.
91-
92-
[Kaelin Laundry]
93-
* Fix fatal error when a requested sysfs device class hasn't been
94-
populated yet.
95-
96-
-- Denis Demidov <[email protected]> Fri, 30 Sep 2016 21:29:28 +0300
97-
98-
python-ev3dev (0.7.0~rc1) stable; urgency=medium
99-
100-
* Drop python 2.x support.
101-
* Performance improvements for reading/writing sysfs attributes.
102-
* Updates for breaking ev3dev kernel changes.
103-
104-
-- David Lechner <[email protected]> Mon, 25 Jul 2016 21:13:43 -0500
105-
106-
python-ev3dev (0.6.0) stable; urgency=medium
107-
108-
[Ralph Hempel]
109-
* Change port_name to address.
110-
111-
[Denis Demidov]
112-
* Restore python3 compatibility
113-
* Implement device enumeration functions
114-
115-
-- David Lechner <[email protected]> Tue, 29 Dec 2015 23:05:39 -0600
116-
117-
python-ev3dev (0.5.0) stable; urgency=low
118-
119-
* Initial Release.
120-
121-
-- David Lechner <[email protected]> Tue, 10 Nov 2015 21:30:53 -0600
5+
--

‎debian/gbp.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[DEFAULT]
2+
debian-branch=ev3dev-stretch
3+
debian-tag=ev3dev-stretch/%(version)s

‎debian/release.sh

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/bin/bash
2+
#
3+
# Maintainer script for publishing releases.
4+
5+
set -e
6+
7+
source=$(dpkg-parsechangelog -S Source)
8+
version=$(dpkg-parsechangelog -S Version)
9+
distribution=$(dpkg-parsechangelog -S Distribution)
10+
codename=$(debian-distro-info --codename --${distribution})
11+
12+
OS=debian DIST=${codename} ARCH=amd64 pbuilder-ev3dev build
13+
OS=raspbian DIST=${codename} ARCH=armhf pbuilder-ev3dev build
14+
15+
debsign ~/pbuilder-ev3dev/debian/${codename}-amd64/${source}_${version}_amd64.changes
16+
debsign ~/pbuilder-ev3dev/raspbian/${codename}-armhf/${source}_${version}_armhf.changes
17+
18+
dput ev3dev-debian ~/pbuilder-ev3dev/debian/${codename}-amd64/${source}_${version}_amd64.changes
19+
dput ev3dev-raspbian ~/pbuilder-ev3dev/raspbian/${codename}-armhf/${source}_${version}_armhf.changes
20+
21+
gbp buildpackage --git-tag-only

‎ev3dev2/_platform/brickpi3.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
from collections import OrderedDict
2+
3+
OUTPUT_A = 'spi0.1:MA'
4+
OUTPUT_B = 'spi0.1:MB'
5+
OUTPUT_C = 'spi0.1:MC'
6+
OUTPUT_D = 'spi0.1:MD'
7+
8+
INPUT_1 = 'spi0.1:S1'
9+
INPUT_2 = 'spi0.1:S2'
10+
INPUT_3 = 'spi0.1:S3'
11+
INPUT_4 = 'spi0.1:S4'
112

213
BUTTONS_FILENAME = None
314
EVDEV_DEVICE_NAME = None
15+
16+
LEDS = OrderedDict()
17+
LEDS['blue_led'] = 'led0:blue:brick-status'
18+
19+
LED_GROUPS = OrderedDict()
20+
LED_GROUPS['LED'] = ('blue_led',)
21+
22+
LED_COLORS = OrderedDict()
23+
LED_COLORS['BLACK'] = (0,)
24+
LED_COLORS['BLUE'] = (1,)

‎ev3dev2/_platform/ev3.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@
2828

2929
from collections import OrderedDict
3030

31-
OUTPUT_A = 'outA'
32-
OUTPUT_B = 'outB'
33-
OUTPUT_C = 'outC'
34-
OUTPUT_D = 'outD'
35-
36-
INPUT_1 = 'in1'
37-
INPUT_2 = 'in2'
38-
INPUT_3 = 'in3'
39-
INPUT_4 = 'in4'
31+
OUTPUT_A = 'ev3-ports:outA'
32+
OUTPUT_B = 'ev3-ports:outB'
33+
OUTPUT_C = 'ev3-ports:outC'
34+
OUTPUT_D = 'ev3-ports:outD'
35+
36+
INPUT_1 = 'ev3-ports:in1'
37+
INPUT_2 = 'ev3-ports:in2'
38+
INPUT_3 = 'ev3-ports:in3'
39+
INPUT_4 = 'ev3-ports:in4'
4040

4141
BUTTONS_FILENAME = '/dev/input/by-path/platform-gpio_keys-event'
4242
EVDEV_DEVICE_NAME = 'EV3 brick buttons'

‎ev3dev2/_platform/pistorms.py

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,28 @@
44
"""
55
from collections import OrderedDict
66

7-
OUTPUT_A = 'pistorms:BBM1'
8-
OUTPUT_B = 'pistorms:BBM2'
9-
OUTPUT_C = 'pistorms:BAM2'
10-
OUTPUT_D = 'pistorms:BAM1'
7+
OUTPUT_A = 'pistorms:BAM1'
8+
OUTPUT_B = 'pistorms:BAM2'
9+
OUTPUT_C = 'pistorms:BBM1'
10+
OUTPUT_D = 'pistorms:BBM2'
1111

12-
INPUT_1 = 'pistorms:BBS1'
13-
INPUT_2 = 'pistorms:BBS2'
14-
INPUT_3 = 'pistorms:BAS2'
15-
INPUT_4 = 'pistorms:BAS1'
12+
INPUT_1 = 'pistorms:BAS1'
13+
INPUT_2 = 'pistorms:BAS2'
14+
INPUT_3 = 'pistorms:BBS1'
15+
INPUT_4 = 'pistorms:BBS2'
1616

1717

18-
BUTTONS_FILENAME = None
19-
EVDEV_DEVICE_NAME = None
18+
BUTTONS_FILENAME = '/dev/input/by-path/platform-3f804000.i2c-event'
19+
EVDEV_DEVICE_NAME = 'PiStorms'
2020

2121

2222
LEDS = OrderedDict()
23-
LEDS['red_left'] = 'pistorms:BA:red:brick-status'
24-
LEDS['green_left'] = 'pistorms:BA:green:brick-statu'
25-
LEDS['blue_left'] = 'pistorms:BA:blue:brick-status'
26-
LEDS['red_right'] = 'pistorms:BB:red:brick-status'
27-
LEDS['green_right'] = 'pistorms:BB:green:brick-statu'
28-
LEDS['blue_right'] = 'pistorms:BB:blue:brick-status'
23+
LEDS['red_left'] = 'pistorms:BB:red:brick-status'
24+
LEDS['red_right'] = 'pistorms:BA:red:brick-status'
25+
LEDS['green_left'] = 'pistorms:BB:green:brick-status'
26+
LEDS['green_right'] = 'pistorms:BA:green:brick-status'
27+
LEDS['blue_left'] = 'pistorms:BB:blue:brick-status'
28+
LEDS['blue_right'] = 'pistorms:BA:blue:brick-status'
2929

3030
LED_GROUPS = OrderedDict()
3131
LED_GROUPS['LEFT'] = ('red_left', 'green_left', 'blue_left')
@@ -35,4 +35,7 @@
3535
LED_COLORS['BLACK'] = (0, 0, 0)
3636
LED_COLORS['RED'] = (1, 0, 0)
3737
LED_COLORS['GREEN'] = (0, 1, 0)
38-
LED_COLORS['BLUE'] = (0, 1, 1)
38+
LED_COLORS['BLUE'] = (0, 0, 1)
39+
LED_COLORS['YELLOW'] = (1, 1, 0)
40+
LED_COLORS['CYAN'] = (0, 1, 1)
41+
LED_COLORS['MAGENTA'] = (1, 0, 1)

0 commit comments

Comments
 (0)