Rev 1255 | Rev 1265 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | SVN | RSS feed
| Rev 1255 | Rev 1257 | ||
|---|---|---|---|
| Line 322... | Line 322... | ||
| 322 | demoHighValue = dimmerValue + steps; |
322 | demoHighValue = dimmerValue + steps; |
| 323 | } |
323 | } |
| 324 | else if (diffToMin >= steps) |
324 | else if (diffToMin >= steps) |
| 325 | { |
325 | { |
| 326 | /* close to max */ |
326 | /* close to max */ |
| 327 | fadeTarget = dimmerValue - steps - diffToMax; |
327 | fadeTarget = dimmerValue - steps - steps + diffToMax; |
| 328 | demoHighValue = ACT_DIMMMER230_MAX_DIM; |
328 | demoHighValue = ACT_DIMMMER230_MAX_DIM; |
| 329 | } |
329 | } |
| 330 | else if (diffToMax >= steps) |
330 | else if (diffToMax >= steps) |
| 331 | { |
331 | { |
| 332 | /* close to min */ |
332 | /* close to min */ |
| 333 | fadeTarget = ACT_DIMMMER230_MIN_DIM; |
333 | fadeTarget = ACT_DIMMMER230_MIN_DIM; |
| 334 | demoHighValue = dimmerValue + steps + diffToMin; |
334 | demoHighValue = dimmerValue + steps + steps - diffToMin; |
| 335 | } |
335 | } |
| 336 | demoState = ACT_DIMMMER230_DEMO_STATE_DECREASE; |
336 | demoState = ACT_DIMMMER230_DEMO_STATE_DECREASE; |
| 337 | 337 | ||
| 338 | if (fadeTarget != dimmerValue) { |
- | |
| 339 | if ((speed&0x80) == 0x80) { |
338 | if ((speed&0x80) == 0x80) { |
| 340 | fadeSpeed = (speed&0x7f)+1; |
339 | fadeSpeed = (speed&0x7f)+1; |
| 341 | fadeSpeedFrac = 1; |
340 | fadeSpeedFrac = 1; |
| 342 | } else { |
341 | } else { |
| 343 | fadeSpeed = 1; |
342 | fadeSpeed = 1; |
| 344 | fadeSpeedFrac = 0x80-(speed&0x7f); |
343 | fadeSpeedFrac = 0x80-(speed&0x7f); |
| 345 | } |
344 | } |
| 346 |
|
345 | if (fadeTarget <= dimmerValue) { |
| 347 | fadeSpeed = -fadeSpeed; |
346 | fadeSpeed = -fadeSpeed; |
| 348 | } |
- | |
| 349 | } |
347 | } |
| 350 | } |
348 | } |
| 351 | } |
349 | } |
| 352 | break; |
350 | break; |
| 353 | 351 | ||