summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Faure <billiob@gmail.com>2011-06-15 08:37:10 +0000
committerBoris Faure <billiob@gmail.com>2011-06-15 08:37:10 +0000
commit0ca69c8c48e4f498880ab05414d73312d43aa34c (patch)
tree20139b3af219fd02597832dfbd8b3990d87478c1
parent3d5d47beac273e8c3e36f8845f035246d5842fe9 (diff)
klok: fix "to" times
SVN revision: 60330
-rw-r--r--klok.edc73
1 files changed, 60 insertions, 13 deletions
diff --git a/klok.edc b/klok.edc
index 156605c..5b74483 100644
--- a/klok.edc
+++ b/klok.edc
@@ -210,7 +210,11 @@ collections {
210 210
211 211
212 // HOUR 212 // HOUR
213 if (hour == 0 || hour == 12) { 213 if (((hour == 11 || hour == 23) &&
214 (minute >= 35 ))
215 || ((hour == 0 || hour == 12) &&
216 (0 <= minute && minute < 35 )))
217 {
214 // TWELVE 218 // TWELVE
215 SHUTON("l5.8"); 219 SHUTON("l5.8");
216 SHUTON("l6.8"); 220 SHUTON("l6.8");
@@ -219,19 +223,31 @@ collections {
219 SHUTON("l9.8"); 223 SHUTON("l9.8");
220 SHUTON("la.8"); 224 SHUTON("la.8");
221 } else 225 } else
222 if (hour == 1 || hour == 13) { 226 if (((hour == 0 || hour == 12) &&
227 (minute >= 35 ))
228 || ((hour == 1 || hour == 13) &&
229 (0 <= minute && minute < 35 )))
230 {
223 // ONE 231 // ONE
224 SHUTON("l0.5"); 232 SHUTON("l0.5");
225 SHUTON("l1.5"); 233 SHUTON("l1.5");
226 SHUTON("l2.5"); 234 SHUTON("l2.5");
227 } else 235 } else
228 if (hour == 2 || hour == 14) { 236 if (((hour == 1 || hour == 13) &&
237 (minute >= 35 ))
238 || ((hour == 2 || hour == 14) &&
239 (0 <= minute && minute < 35 )))
240 {
229 // TWO 241 // TWO
230 SHUTON("l8.6"); 242 SHUTON("l8.6");
231 SHUTON("l9.6"); 243 SHUTON("l9.6");
232 SHUTON("la.6"); 244 SHUTON("la.6");
233 } else 245 } else
234 if (hour == 3 || hour == 15) { 246 if (((hour == 2 || hour == 14) &&
247 (minute >= 35 ))
248 || ((hour == 3 || hour == 15) &&
249 (0 <= minute && minute < 35 )))
250 {
235 // THREE 251 // THREE
236 SHUTON("l6.5"); 252 SHUTON("l6.5");
237 SHUTON("l7.5"); 253 SHUTON("l7.5");
@@ -239,27 +255,43 @@ collections {
239 SHUTON("l9.5"); 255 SHUTON("l9.5");
240 SHUTON("la.5"); 256 SHUTON("la.5");
241 } else 257 } else
242 if (hour == 4 || hour == 16) { 258 if (((hour == 3 || hour == 15) &&
259 (minute >= 35 ))
260 || ((hour == 4 || hour == 16) &&
261 (0 <= minute && minute < 35 )))
262 {
243 // FOUR 263 // FOUR
244 SHUTON("l0.6"); 264 SHUTON("l0.6");
245 SHUTON("l1.6"); 265 SHUTON("l1.6");
246 SHUTON("l2.6"); 266 SHUTON("l2.6");
247 SHUTON("l3.6"); 267 SHUTON("l3.6");
248 } else 268 } else
249 if (hour == 5 || hour == 17) { 269 if (((hour == 4 || hour == 16) &&
270 (minute >= 35 ))
271 || ((hour == 5 || hour == 17) &&
272 (0 <= minute && minute < 35 )))
273 {
250 // FIVE 274 // FIVE
251 SHUTON("l4.6"); 275 SHUTON("l4.6");
252 SHUTON("l5.6"); 276 SHUTON("l5.6");
253 SHUTON("l6.6"); 277 SHUTON("l6.6");
254 SHUTON("l7.6"); 278 SHUTON("l7.6");
255 } else 279 } else
256 if (hour == 6 || hour == 18) { 280 if (((hour == 5 || hour == 17) &&
281 (minute >= 35 ))
282 || ((hour == 6 || hour == 18) &&
283 (0 <= minute && minute < 35 )))
284 {
257 // SIX 285 // SIX
258 SHUTON("l3.5"); 286 SHUTON("l3.5");
259 SHUTON("l4.5"); 287 SHUTON("l4.5");
260 SHUTON("l5.5"); 288 SHUTON("l5.5");
261 } else 289 } else
262 if (hour == 7 || hour == 19) { 290 if (((hour == 6 || hour == 18) &&
291 (minute >= 35 ))
292 || ((hour == 7 || hour == 19) &&
293 (0 <= minute && minute < 35 )))
294 {
263 // SEVEN 295 // SEVEN
264 SHUTON("l0.8"); 296 SHUTON("l0.8");
265 SHUTON("l1.8"); 297 SHUTON("l1.8");
@@ -267,7 +299,11 @@ collections {
267 SHUTON("l3.8"); 299 SHUTON("l3.8");
268 SHUTON("l4.8"); 300 SHUTON("l4.8");
269 } else 301 } else
270 if (hour == 8 || hour == 20) { 302 if (((hour == 7 || hour == 19) &&
303 (minute >= 35 ))
304 || ((hour == 8 || hour == 20) &&
305 (0 <= minute && minute < 35 )))
306 {
271 // EIGHT 307 // EIGHT
272 SHUTON("l0.7"); 308 SHUTON("l0.7");
273 SHUTON("l1.7"); 309 SHUTON("l1.7");
@@ -275,20 +311,32 @@ collections {
275 SHUTON("l3.7"); 311 SHUTON("l3.7");
276 SHUTON("l4.7"); 312 SHUTON("l4.7");
277 } else 313 } else
278 if (hour == 9 || hour == 21) { 314 if (((hour == 8 || hour == 20) &&
315 (minute >= 35 ))
316 || ((hour == 9 || hour == 21) &&
317 (0 <= minute && minute < 35 )))
318 {
279 // NINE 319 // NINE
280 SHUTON("l7.4"); 320 SHUTON("l7.4");
281 SHUTON("l8.4"); 321 SHUTON("l8.4");
282 SHUTON("l9.4"); 322 SHUTON("l9.4");
283 SHUTON("la.4"); 323 SHUTON("la.4");
284 } else 324 } else
285 if (hour == 10 || hour == 22) { 325 if (((hour == 9 || hour == 21) &&
326 (minute >= 35 ))
327 || ((hour == 10 || hour == 22) &&
328 (0 <= minute && minute < 35 )))
329 {
286 // TEN 330 // TEN
287 SHUTON("l0.9"); 331 SHUTON("l0.9");
288 SHUTON("l1.9"); 332 SHUTON("l1.9");
289 SHUTON("l2.9"); 333 SHUTON("l2.9");
290 } else 334 } else
291 if (hour == 11 || hour == 23) { 335 if (((hour == 10 || hour == 22) &&
336 (minute >= 35 ))
337 || ((hour == 11 || hour == 23) &&
338 (0 <= minute && minute < 35 )))
339 {
292 // ELEVEN 340 // ELEVEN
293 SHUTON("l5.7"); 341 SHUTON("l5.7");
294 SHUTON("l6.7"); 342 SHUTON("l6.7");
@@ -297,7 +345,6 @@ collections {
297 SHUTON("l9.7"); 345 SHUTON("l9.7");
298 SHUTON("la.7"); 346 SHUTON("la.7");
299 } 347 }
300
301 } 348 }
302 } 349 }
303 350