projects
/
tabakrolletjie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5cbe7a3
)
merged display of multicoloured light into base class
author
adrianna
<adrianna.pinska@gmail.com>
Sat, 10 Sep 2016 10:47:05 +0000
(12:47 +0200)
committer
adrianna
<adrianna.pinska@gmail.com>
Sat, 10 Sep 2016 10:47:05 +0000
(12:47 +0200)
data/stations/station-alpha.json
patch
|
blob
|
history
diff --git
a/data/stations/station-alpha.json
b/data/stations/station-alpha.json
index 5df98c3a54f517163090665ff9625cd30f07ca0a..f0e27e509bcd2af4aba2b09cd775887047d6862b 100644
(file)
--- a/
data/stations/station-alpha.json
+++ b/
data/stations/station-alpha.json
@@
-42,7
+42,7
@@
"intensity": 0.5
},
{
- "type": "
multicolour
lamp",
+ "type": "lamp",
"colours": ["red", "yellow", "green"],
"position": [300, 300],
"intensity": 0.5