Skip to content

Commit cfa5ece

Browse files
BertLindemanBertLindeman
committed
Adapt filenames to image 20151230
led names port_name -> address
1 parent 9e3213a commit cfa5ece

11 files changed

Lines changed: 206 additions & 174 deletions

File tree

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,14 @@ _site/
238238
TODO.txt
239239
perldoc
240240
*.prev.*
241+
*_prev
241242
*.old
242243
*.crlf
243244
calc_ntp_good
244245
calc_ntp_good.*
245246
package-stash-conflicts
246247
*_v1.1
248+
grunt
249+
listports_pre_3.16.1-8
250+
showactivityprev
251+
showsensors_pre_3.16.1-8

‎bert_ev3dev_functions‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,7 @@
1717
# 20141020 BL Added reverse colors
1818
# 20141213 BL Add escapes to the colors so Bash knows they are
1919
# "non-printable"
20-
# 20150521 BL adapt for kernel 3.16.7-ckt11-5-ev3dev-ev3
21-
# no longer ev3:red:left
22-
# ev3:green:left
23-
# ev3:red:right
24-
# ev3:green:right
25-
# but ev3-left0:red:ev3dev
26-
# ev3-left1:green:ev3dev
27-
# ev3-right0:red:ev3dev
28-
# ev3-right1:green:ev3dev
29-
20+
# 20160103 BL Adapt to image 20151230 (change led file names)
3021
#============================================================================
3122

3223

@@ -89,8 +80,8 @@ findsensorctl () {
8980
# for d in /sys/class/msensor/sensor*;
9081
for d in /sys/class/lego-sensor/sensor*;
9182
do
92-
if [ -r "$d/port_name" ]; then
93-
port=`cat $d/port_name`
83+
if [ -r "$d/address" ]; then
84+
port=`cat $d/address`
9485
if [ "$port" == "in${portparm}" ]; then
9586
CURSENSOR=${d: -1:1}
9687
# take the numeric part at the end of the basename:
@@ -205,8 +196,8 @@ findmotorctl () {
205196
# for d in /sys/class/tacho-motor/motor*/ /sys/class/dc-motor/motor*/ /sys/class/servo-motor/motor*/ ;
206197
for d in /sys/class/*motor/motor*/ ;
207198
do
208-
if [ -r "$d/port_name" ]; then
209-
port=`cat $d/port_name`
199+
if [ -r "$d/address" ]; then
200+
port=`cat $d/address`
210201
SEENPORT="$SEENPORT $port"
211202
if [ "$port" == "out$parm1" ]; then
212203
CURMOTOR=${d:0:-1}
@@ -223,20 +214,20 @@ OFFred () {
223214
#
224215
# function to switch OFF the red EV3-leds (left and right)
225216
#
226-
echo none > /sys/class/leds/ev3-right0\:red\:ev3dev/trigger
227-
echo 0 > /sys/class/leds/ev3-right0\:red\:ev3dev/brightness
228-
echo none > /sys/class/leds/ev3-left0\:red\:ev3dev/trigger
229-
echo 0 > /sys/class/leds/ev3-left0\:red\:ev3dev/brightness
217+
echo none > /sys/class/leds/ev3\:right\:red\:ev3dev/trigger
218+
echo 0 > /sys/class/leds/ev3\:right\:red\:ev3dev/brightness
219+
echo none > /sys/class/leds/ev3\:left\:red\:ev3dev/trigger
220+
echo 0 > /sys/class/leds/ev3\:left\:red\:ev3dev/brightness
230221
}
231222

232223
OFFgreen () {
233224
#
234225
# function to switch OFF the green EV3-leds (left and right)
235226
#
236-
echo none > /sys/class/leds/ev3-left1\:green\:ev3dev/trigger
237-
echo 0 > /sys/class/leds/ev3-left1\:green\:ev3dev/brightness
238-
echo none > /sys/class/leds/ev3-right1\:green\:ev3dev/trigger
239-
echo 0 > /sys/class/leds/ev3-right1\:green\:ev3dev/brightness
227+
echo none > /sys/class/leds/ev3\:left\:green\:ev3dev/trigger
228+
echo 0 > /sys/class/leds/ev3\:left\:green\:ev3dev/brightness
229+
echo none > /sys/class/leds/ev3\:right\:green\:ev3dev/trigger
230+
echo 0 > /sys/class/leds/ev3\:right\:green\:ev3dev/brightness
240231
}
241232

242233
OFFleds () {

‎blinkleds‎

Lines changed: 20 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -20,57 +20,48 @@
2020
# use to make sliding colors
2121
# 20140826 BL o Added script header
2222
# o Show in the terminal what is being done.
23-
# 20150521 BL adapt for kernel 3.16.7-ckt11-5-ev3dev-ev3
24-
# no longer ev3:red:left
25-
# ev3:green:left
26-
# ev3:red:right
27-
# ev3:green:right
28-
# but ev3-left0:red:ev3dev
29-
# ev3-left1:green:ev3dev
30-
# ev3-right0:red:ev3dev
31-
# ev3-right1:green:ev3dev
3223
#============================================================================
3324
#
3425
. /usr/local/bin/bert_ev3dev_functions
3526

3627

3728
# echo " deactivate first"
38-
echo none > /sys/class/leds/ev3-right1\:green\:ev3dev/trigger
39-
echo none > /sys/class/leds/ev3-right0\:red\:ev3dev/trigger
40-
echo none > /sys/class/leds/ev3-left1\:green\:ev3dev/trigger
41-
echo none > /sys/class/leds/ev3-left0\:red\:ev3dev/trigger
29+
echo none > /sys/class/leds/ev3\:green\:right\:ev3dev/trigger
30+
echo none > /sys/class/leds/ev3\:red\:right\:ev3dev/trigger
31+
echo none > /sys/class/leds/ev3\:green\:left\:ev3dev/trigger
32+
echo none > /sys/class/leds/ev3\:red\:left\:ev3dev/trigger
4233
OFFleds
4334
sleep 0.5s
4435

4536
# red -- green
46-
echo 255 > /sys/class/leds/ev3-left0\:red\:ev3dev/brightness
47-
echo 255 > /sys/class/leds/ev3-right1\:green\:ev3dev/brightness
37+
echo 255 > /sys/class/leds/ev3\:red\:left\:ev3dev/brightness
38+
echo 255 > /sys/class/leds/ev3\:green\:right\:ev3dev/brightness
4839
sleep 0.5s
4940

5041
# green -- red
51-
echo 0 > /sys/class/leds/ev3-left0\:red\:ev3dev/brightness
52-
echo 255 > /sys/class/leds/ev3-right0\:red\:ev3dev/brightness
53-
echo 255 > /sys/class/leds/ev3-left1\:green\:ev3dev/brightness
54-
echo 0 > /sys/class/leds/ev3-right1\:green\:ev3dev/brightness
42+
echo 0 > /sys/class/leds/ev3\:red\:left\:ev3dev/brightness
43+
echo 255 > /sys/class/leds/ev3\:red\:right\:ev3dev/brightness
44+
echo 255 > /sys/class/leds/ev3\:green\:left\:ev3dev/brightness
45+
echo 0 > /sys/class/leds/ev3\:green\:right\:ev3dev/brightness
5546
sleep 0.5s
56-
echo 255 > /sys/class/leds/ev3-left0\:red\:ev3dev/brightness
57-
echo 0 > /sys/class/leds/ev3-right0\:red\:ev3dev/brightness
58-
echo 0 > /sys/class/leds/ev3-left1\:green\:ev3dev/brightness
59-
echo 255 > /sys/class/leds/ev3-right1\:green\:ev3dev/brightness
47+
echo 255 > /sys/class/leds/ev3\:red\:left\:ev3dev/brightness
48+
echo 0 > /sys/class/leds/ev3\:red\:right\:ev3dev/brightness
49+
echo 0 > /sys/class/leds/ev3\:green\:left\:ev3dev/brightness
50+
echo 255 > /sys/class/leds/ev3\:green\:right\:ev3dev/brightness
6051
sleep 0.5s
6152

6253
OFFleds
6354

64-
echo 255 > /sys/class/leds/ev3-left1\:green\:ev3dev/brightness
65-
echo 255 > /sys/class/leds/ev3-right1\:green\:ev3dev/brightness
55+
echo 255 > /sys/class/leds/ev3\:green\:left\:ev3dev/brightness
56+
echo 255 > /sys/class/leds/ev3\:green\:right\:ev3dev/brightness
6657
sleep 1s
6758
OFFgreen
6859
sleep 0.25s
6960
for (( b1=0; b1<=255; b1++ )); do
70-
echo $b1 > /sys/class/leds/ev3-left1\:green\:ev3dev/brightness
71-
echo $((255-$b1)) > /sys/class/leds/ev3-left0\:red\:ev3dev/brightness
72-
echo $b1 > /sys/class/leds/ev3-right0\:red\:ev3dev/brightness
73-
echo $((255-$b1)) > /sys/class/leds/ev3-right1\:green\:ev3dev/brightness
61+
echo $b1 > /sys/class/leds/ev3\:green\:left\:ev3dev/brightness
62+
echo $((255-$b1)) > /sys/class/leds/ev3\:red\:left\:ev3dev/brightness
63+
echo $b1 > /sys/class/leds/ev3\:red\:right\:ev3dev/brightness
64+
echo $((255-$b1)) > /sys/class/leds/ev3\:green\:right\:ev3dev/brightness
7465
sleep 0.005s
7566
done
7667
sleep 1s

‎blinkvoltage‎

Lines changed: 24 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,8 @@
1919
# 20140914 BL Also use the actual voltage to set the blinkling
2020
# 20140826 BL o Add script header
2121
# o try to prevent abmber blinking flipflop red/green
22-
# 20150521 BL adapt for kernel 3.16.7-ckt11-5-ev3dev-ev3
23-
# no longer ev3:red:left
24-
# ev3:green:left
25-
# ev3:red:right
26-
# ev3:green:right
27-
# but ev3-left0:red:ev3dev
28-
# ev3-left1:green:ev3dev
29-
# ev3-right0:red:ev3dev
30-
# ev3-right1:green:ev3dev
22+
# 20151230 BL Adapt to image 20151230. New file names for leds.
23+
#
3124
#============================================================================
3225

3326

@@ -70,38 +63,33 @@ get_delay() {
7063
# to prevent flipflopping red<-->green set triggers close to eachother
7164
# not ALWAYS successful. Do not have a way (yet) to ensure
7265
# AMBER leds and not flip=flopping green/red
73-
# ev3-left0:red:ev3dev
74-
# ev3-left1:green:ev3dev
75-
# ev3-right0:red:ev3dev
76-
# ev3-right1:green:ev3dev
77-
7866
setAmber() {
79-
echo timer > /sys/class/leds/ev3-${side}*:green:ev3dev/trigger
80-
echo timer > /sys/class/leds/ev3-${side}*:red:ev3dev/trigger
81-
echo 500 > /sys/class/leds/ev3-${side}*:green:ev3dev/delay_on
82-
echo 500 > /sys/class/leds/ev3-${side}*:red:ev3dev/delay_on
83-
echo 500 > /sys/class/leds/ev3-${side}*:green:ev3dev/delay_off
84-
echo 500 > /sys/class/leds/ev3-${side}*:red:ev3dev/delay_off
85-
echo $delay_off > /sys/class/leds/ev3-${side}*:green:ev3dev/delay_off
86-
echo $delay_off > /sys/class/leds/ev3-${side}*:red:ev3dev/delay_off
87-
echo $delay_on > /sys/class/leds/ev3-${side}*:green:ev3dev/delay_on
88-
echo $delay_on > /sys/class/leds/ev3-${side}*:red:ev3dev/delay_on
89-
echo $intens > /sys/class/leds/ev3-${side}*:green:ev3dev/brightness
90-
echo $intens > /sys/class/leds/ev3-${side}*:red:ev3dev/brightness
67+
echo timer > /sys/class/leds/ev3:$side:green:ev3dev/trigger
68+
echo timer > /sys/class/leds/ev3:$side:red:ev3dev/trigger
69+
echo 500 > /sys/class/leds/ev3:$side:green:ev3dev/delay_on
70+
echo 500 > /sys/class/leds/ev3:$side:red:ev3dev/delay_on
71+
echo 500 > /sys/class/leds/ev3:$side:green:ev3dev/delay_off
72+
echo 500 > /sys/class/leds/ev3:$side:red:ev3dev/delay_off
73+
echo $delay_off > /sys/class/leds/ev3:$side:green:ev3dev/delay_off
74+
echo $delay_off > /sys/class/leds/ev3:$side:red:ev3dev/delay_off
75+
echo $delay_on > /sys/class/leds/ev3:$side:green:ev3dev/delay_on
76+
echo $delay_on > /sys/class/leds/ev3:$side:red:ev3dev/delay_on
77+
echo $intens > /sys/class/leds/ev3:$side:green:ev3dev/brightness
78+
echo $intens > /sys/class/leds/ev3:$side:red:ev3dev/brightness
9179
}
9280

9381
setRed() {
94-
echo timer > /sys/class/leds/ev3-${side}*:red:ev3dev/trigger
95-
echo $intens > /sys/class/leds/ev3-${side}*:red:ev3dev/brightness
96-
echo $delay_on > /sys/class/leds/ev3-${side}*:red:ev3dev/delay_on
97-
echo $delay_off > /sys/class/leds/ev3-${side}*:red:ev3dev/delay_off
82+
echo timer > /sys/class/leds/ev3:$side:red:ev3dev/trigger
83+
echo $intens > /sys/class/leds/ev3:$side:red:ev3dev/brightness
84+
echo $delay_on > /sys/class/leds/ev3:$side:red:ev3dev/delay_on
85+
echo $delay_off > /sys/class/leds/ev3:$side:red:ev3dev/delay_off
9886
}
9987

10088
setGrn() {
101-
echo timer > /sys/class/leds/ev3-${side}*:green:ev3dev/trigger
102-
echo $intens > /sys/class/leds/ev3-${side}*:green:ev3dev/brightness
103-
echo $delay_on > /sys/class/leds/ev3-${side}*:green:ev3dev/delay_on
104-
echo $delay_off > /sys/class/leds/ev3-${side}*:green:ev3dev/delay_off
89+
echo timer > /sys/class/leds/ev3:$side:green:ev3dev/trigger
90+
echo $intens > /sys/class/leds/ev3:$side:green:ev3dev/brightness
91+
echo $delay_on > /sys/class/leds/ev3:$side:green:ev3dev/delay_on
92+
echo $delay_off > /sys/class/leds/ev3:$side:green:ev3dev/delay_off
10593

10694
}
10795

@@ -122,11 +110,11 @@ setGrn() {
122110
fi
123111

124112
# first set all left colors OFF
125-
ledbase="/sys/class/leds/ev3-${side}*:red:ev3dev"
113+
ledbase="/sys/class/leds/ev3:$side:red:ev3dev"
126114
echo none > $ledbase/trigger
127115
echo 0 > $ledbase/brightness
128116

129-
ledbase="/sys/class/leds/ev3-${side}*:green:ev3dev"
117+
ledbase="/sys/class/leds/ev3:$side:green:ev3dev"
130118
echo none > $ledbase/trigger
131119
echo 0 > $ledbase/brightness
132120

‎listports‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
# kernel version 3.16.1-8-ev3dev
3030
# 20150202 BL Shift some fields in the report to prevent ragged columns
3131
# 20150416 BL update for kernel 3.16.7-ckt9
32+
# 20160103 BL adapt to image 20151230 (change filenames)
33+
#
3234
#============================================================================
3335

3436
. /usr/local/bin/bert_ev3dev_functions
@@ -37,8 +39,8 @@
3739
findinport() {
3840
# look in lego-port sysfs directories to determine which lego-port
3941
# is processing the in% port we are looking for (From parameter-1)
40-
portpath=`grep -i "${1}" /sys/class/lego-port/port*/port_name`
41-
# results in /sys/class/lego-port/port7/port_name:outD
42+
portpath=`grep -i "${1}" /sys/class/lego-port/port*/address`
43+
# results in /sys/class/lego-port/port7/address:outD
4244
# take dirname: bla/bla/port7
4345
# take basename
4446
portdir=`dirname ${portpath}`
@@ -161,7 +163,7 @@ do
161163
else
162164
porttype1="${basename%%:*}"
163165
porttype2="${p#*:}"
164-
portname="`cat $p/port_name`"
166+
portname="`cat $p/address`"
165167
fi
166168
#
167169
outportletter=${portname:3:1} # out%

‎setled‎

Lines changed: 33 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,7 @@
1919
# brightness since kernel 3.16.1 is honoured
2020
# and no longer a switch
2121
# 20140826 BL add script header
22-
# 20150521 BL adapt for kernel 3.16.7-ckt11-5-ev3dev-ev3
23-
# no longer ev3:red:left
24-
# ev3:green:left
25-
# ev3:red:right
26-
# ev3:green:right
27-
# but ev3-left0:red:ev3dev
28-
# ev3-left1:green:ev3dev
29-
# ev3-right0:red:ev3dev
30-
# ev3-right1:green:ev3dev
22+
# 20160103 BL adapt to image 20151230 (change filenames)
3123
#
3224
#============================================================================
3325

@@ -56,6 +48,23 @@ usageEXIT () {
5648

5749
#set -v -x
5850

51+
#showLEDtrigger () {
52+
# # echo "showing trigger from $1"
53+
# for word in `cat $1` ;
54+
# do
55+
# delim=${word:0:1}${word:${#word}-1:1}
56+
# if [ $delim == "[]" ]; then
57+
# trigger=${word:1:${#word}-2}
58+
# # echo "current trigger now: $trigger"
59+
# break # do not search further
60+
# else
61+
# trigger=$word
62+
# fi
63+
# done
64+
# currenttrigger=$trigger
65+
# echo " current trigger=$currenttrigger"
66+
# }
67+
5968
verifyLEDtrigger () {
6069
for word in `cat $2` ;
6170
do
@@ -131,56 +140,41 @@ verifyLEDtrigger () {
131140
;;
132141
esac
133142

134-
#ledbase="/sys/class/leds/ev3:$tosetColor:$side"
135-
# using ledid for the combination of ${side} and ${tosetcolor}
136-
# as the color adds a suffix to the side
137-
# e.g. left red becomes left0:red
138-
# and left green becomes left1:green
139-
# there will be a reason for this.
140-
if [ "${tosetColor}" == "red" ]; then
141-
ledid="${side}0:${tosetColor}"
142-
else
143-
ledid="${side}1:${tosetColor}"
144-
fi
145-
ledbase="/sys/class/leds/ev3-${ledid}:ev3dev"
143+
ledbase="/sys/class/leds/ev3:$side:$tosetColor:ev3dev"
146144
ledbrightness="$ledbase/brightness"
147145
ledtriggerpath="$ledbase/trigger"
148146

149-
if [ "${tosetTrigger}" == "" ]; then
147+
if [ "$tosetTrigger" == "" ]; then
150148
tosetTrigger ="none"
151149
else
152-
verifyLEDtrigger "${tosetTrigger}" "${ledtriggerpath}"
150+
verifyLEDtrigger "$tosetTrigger" "$ledtriggerpath"
153151
fi
154152

155153
echo "base directory $ledbase"
156154

157155
if [ $command == "cat" ]; then
158156
echo " brightness=`cat $ledbrightness`"
159-
# showtrigger "`cat ${ledtriggerpath}`"
157+
showtrigger "`cat $ledtriggerpath`"
160158
else
161159
echo "BEFORE:"
162160
echo " brightness=`cat $ledbrightness`"
163-
164-
echo $valueORzero > $ledbrightness
165-
if [ $? -ne 0 ]; then
166-
echo -e "!!!!!!!!returncode of command: $?"
167-
fi
168161

169-
showtrigger "`cat ${ledtriggerpath}`"
170-
echo " trigger = \"${currenttrigger}\""
162+
showtrigger "`cat $ledtriggerpath`"
171163

164+
# echo "setting trigger to $tosetTrigger > $ledtriggerpath"
172165
if [ "$p4" != "" ]; then
173-
174-
echo ${tosetTrigger} > ${ledtriggerpath}
166+
echo $tosetTrigger > $ledtriggerpath
175167
if [ $? -ne 0 ]; then
176168
echo -e "!!!!!!!!returncode of trigger: $?"
177169
fi
178-
fi
179-
170+
fi
171+
# showLEDtrigger $ledtriggerpath
172+
173+
echo $valueORzero > $ledbrightness
174+
if [ $? -ne 0 ]; then
175+
echo -e "!!!!!!!!returncode of command: $?"
176+
fi
180177
echo "AFTER:"
181178
echo " brightness=`cat $ledbrightness`"
182-
183-
showtrigger "`cat ${ledtriggerpath}`"
184-
echo " trigger = \"${currenttrigger}\""
185-
179+
showtrigger "`cat $ledtriggerpath`"
186180
fi

0 commit comments

Comments
 (0)