Ubuntu Test Cases

Merge lp:~pwlars/ubuntu-test-cases/krillin-01-13 into lp:ubuntu-test-cases/touch

  1. krillin-01-13
  2. Merge into touch
Proposed by Paul Larson
Status: Merged
Approved by: Paul Larson
Approved revision: 414
Merged at revision: 414
Proposed branch: lp:~pwlars/ubuntu-test-cases/krillin-01-13
Merge into: lp:ubuntu-test-cases/touch
Diff against target: 29 lines (+10/-2)
1 file modified
scripts/device_info.py (+10/-2)
To merge this branch: bzr merge lp:~pwlars/ubuntu-test-cases/krillin-01-13
Reviewer Review Type Date Requested Status
Francis Ginther Approve
Para Siva (community) Approve
Review via email: mp+273877@code.launchpad.net

Commit message

Add krillin-01 and krillin-13

Description of the change

Add krillin-01 and krillin-13

To post a comment you must log in.
Revision history for this message
Para Siva (psivaa) :
review: Approve
Revision history for this message
Francis Ginther (fginther) wrote :

Approve.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/device_info.py'
2--- scripts/device_info.py 2015-10-07 20:22:03 +0000
3+++ scripts/device_info.py 2015-10-08 17:13:10 +0000
4@@ -262,7 +262,11 @@
5 "arale-08": TouchDevice("arale", "75UABL65U7BB",
6 image_channel="ubuntu-touch/rc-proposed/meizu.en",
7 extra_args=['--device', 'arale']),
8- "krillin-01": TouchDevice("krillin", "JB011018"),
9+ "krillin-01": TouchDevice("krillin", "JB011018",
10+ relay_url="http://bos01-a-04-shelf05-relay.power",
11+ power_pin=RelayPin(1, 7),
12+ volume_up_pin=RelayPin(2, 0),
13+ volume_down_pin=RelayPin(2, 1)),
14 "krillin-02": TouchDevice("krillin", "JB010894"),
15 "krillin-03": TouchDevice("krillin", "JB015156",
16 relay_url="http://bos01-a-04-shelf03-relay.power",
17@@ -306,7 +310,11 @@
18 power_pin=RelayPin(0, 3),
19 volume_up_pin=RelayPin(0, 4),
20 volume_down_pin=RelayPin(0, 5)),
21- "krillin-13": TouchDevice("krillin", "JB044235"),
22+ "krillin-13": TouchDevice("krillin", "JB044235",
23+ relay_url="http://bos01-a-04-shelf05-relay.power",
24+ power_pin=RelayPin(0, 6),
25+ volume_up_pin=RelayPin(0, 7),
26+ volume_down_pin=RelayPin(1, 0)),
27 "krillin-14": TouchDevice("krillin", "JB072205",
28 relay_url="http://bos01-a-04-shelf05-relay.power",
29 power_pin=RelayPin(1, 1),

Subscribers

People subscribed via source and target branches