Rev 1083 | Rev 1093 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | SVN | RSS feed
| Rev 1083 | Rev 1091 | ||
|---|---|---|---|
| Line 312... | Line 312... | ||
| 312 | demoHighValue = dimmerValue + steps + diffToMin; |
312 | demoHighValue = dimmerValue + steps + diffToMin; |
| 313 | } |
313 | } |
| 314 | demoState = ACT_DIMMMER230_DEMO_STATE_DECREASE; |
314 | demoState = ACT_DIMMMER230_DEMO_STATE_DECREASE; |
| 315 | 315 | ||
| 316 | if (fadeTarget != dimmerValue) { |
316 | if (fadeTarget != dimmerValue) { |
| 317 | if ((speed&0x80) == |
317 | if ((speed&0x80) == 0x80) { |
| 318 | fadeSpeed = speed |
318 | fadeSpeed = (speed&0x7f)+1; |
| 319 | fadeSpeedFrac = 1; |
319 | fadeSpeedFrac = 1; |
| 320 | } else { |
320 | } else { |
| 321 | fadeSpeed = 1; |
321 | fadeSpeed = 1; |
| 322 | fadeSpeedFrac = speed& |
322 | fadeSpeedFrac = 0x80-(speed&0x7f); |
| 323 | } |
323 | } |
| 324 | if (fadeTarget < dimmerValue) { |
324 | if (fadeTarget < dimmerValue) { |
| 325 | fadeSpeed = -fadeSpeed; |
325 | fadeSpeed = -fadeSpeed; |
| 326 | } |
326 | } |
| 327 | } |
327 | } |
| Line 337... | Line 337... | ||
| 337 | uint8_t direction = rxMsg->Data[2]; |
337 | uint8_t direction = rxMsg->Data[2]; |
| 338 | 338 | ||
| 339 | fadeSpeedCnt = 0; |
339 | fadeSpeedCnt = 0; |
| 340 | fadeSpeed = 0; |
340 | fadeSpeed = 0; |
| 341 | uint8_t endValue = 0; |
341 | uint8_t endValue = 0; |
| 342 | if (direction == |
342 | if (direction == CAN_MODULE_ENUM_DIMMER230_START_FADE_DIRECTION_INCREASE) { |
| 343 | endValue = ACT_DIMMMER230_MAX_DIM; |
343 | endValue = ACT_DIMMMER230_MAX_DIM; |
| 344 | } else if (direction == |
344 | } else if (direction == CAN_MODULE_ENUM_DIMMER230_START_FADE_DIRECTION_DECREASE) { |
| 345 | endValue = ACT_DIMMMER230_MIN_DIM; |
345 | endValue = ACT_DIMMMER230_MIN_DIM; |
| 346 | } |
346 | } |
| 347 | 347 | ||
| 348 | if (speed == 0) { |
348 | if (speed == 0) { |
| 349 | dimmerValue = endValue; /* set dimmer value immediately */ |
349 | dimmerValue = endValue; /* set dimmer value immediately */ |
| 350 | } else { |
350 | } else { |
| 351 | fadeTarget = endValue; |
351 | fadeTarget = endValue; |
| 352 | if (fadeTarget != dimmerValue) { |
352 | if (fadeTarget != dimmerValue) { |
| 353 | if ((speed&0x80) == |
353 | if ((speed&0x80) == 0x80) { |
| 354 | fadeSpeed = speed |
354 | fadeSpeed = (speed&0x7f)+1; |
| 355 | fadeSpeedFrac = 1; |
355 | fadeSpeedFrac = 1; |
| 356 | } else { |
356 | } else { |
| 357 | fadeSpeed = 1; |
357 | fadeSpeed = 1; |
| 358 | fadeSpeedFrac = speed& |
358 | fadeSpeedFrac = 0x80-(speed&0x7f); |
| 359 | } |
359 | } |
| 360 | if (fadeTarget < dimmerValue) { |
360 | if (fadeTarget < dimmerValue) { |
| 361 | fadeSpeed = -fadeSpeed; |
361 | fadeSpeed = -fadeSpeed; |
| 362 | } |
362 | } |
| 363 | } |
363 | } |
| Line 384... | Line 384... | ||
| 384 | if (speed == 0) { |
384 | if (speed == 0) { |
| 385 | dimmerValue = endValue; /* set dimmer value immediately */ |
385 | dimmerValue = endValue; /* set dimmer value immediately */ |
| 386 | } else { |
386 | } else { |
| 387 | fadeTarget = endValue; |
387 | fadeTarget = endValue; |
| 388 | if (fadeTarget != dimmerValue) { |
388 | if (fadeTarget != dimmerValue) { |
| 389 | if ((speed&0x80) == |
389 | if ((speed&0x80) == 0x80) { |
| 390 | fadeSpeed = speed |
390 | fadeSpeed = (speed&0x7f)+1; |
| 391 | fadeSpeedFrac = 1; |
391 | fadeSpeedFrac = 1; |
| 392 | } else { |
392 | } else { |
| 393 | fadeSpeed = 1; |
393 | fadeSpeed = 1; |
| 394 | fadeSpeedFrac = speed& |
394 | fadeSpeedFrac = 0x80-(speed&0x7f); |
| 395 | } |
395 | } |
| 396 | if (fadeTarget < dimmerValue) { |
396 | if (fadeTarget < dimmerValue) { |
| 397 | fadeSpeed = -fadeSpeed; |
397 | fadeSpeed = -fadeSpeed; |
| 398 | } |
398 | } |
| 399 | } |
399 | } |
| Line 411... | Line 411... | ||
| 411 | 411 | ||
| 412 | fadeSpeedCnt = 0; |
412 | fadeSpeedCnt = 0; |
| 413 | fadeSpeed = 0; |
413 | fadeSpeed = 0; |
| 414 | uint8_t tempDimVal = dimmerValue; |
414 | uint8_t tempDimVal = dimmerValue; |
| 415 | uint8_t tempDimVal2 = dimmerValue; |
415 | uint8_t tempDimVal2 = dimmerValue; |
| 416 | if (direction == |
416 | if (direction == CAN_MODULE_ENUM_DIMMER230_REL_FADE_DIRECTION_INCREASE) { /* if increase */ |
| 417 | tempDimVal2 += steps; /* calculate new value */ |
417 | tempDimVal2 += steps; /* calculate new value */ |
| 418 | if (tempDimVal2 < tempDimVal) { /* make overflow test */ |
418 | if (tempDimVal2 < tempDimVal) { /* make overflow test */ |
| 419 | tempDimVal2 = ACT_DIMMMER230_MAX_DIM; |
419 | tempDimVal2 = ACT_DIMMMER230_MAX_DIM; |
| 420 | } |
420 | } |
| 421 | } else if (direction == |
421 | } else if (direction == CAN_MODULE_ENUM_DIMMER230_REL_FADE_DIRECTION_DECREASE) { /* if decrease */ |
| 422 | tempDimVal2 -= steps; |
422 | tempDimVal2 -= steps; |
| 423 | if (tempDimVal2 > tempDimVal) { |
423 | if (tempDimVal2 > tempDimVal) { |
| 424 | tempDimVal2 = ACT_DIMMMER230_MIN_DIM; |
424 | tempDimVal2 = ACT_DIMMMER230_MIN_DIM; |
| 425 | } |
425 | } |
| 426 | } |
426 | } |
| Line 428... | Line 428... | ||
| 428 | dimmerValue = tempDimVal2; /* set dimmer value immediately */ |
428 | dimmerValue = tempDimVal2; /* set dimmer value immediately */ |
| 429 | } else { |
429 | } else { |
| 430 | fadeTarget = tempDimVal2; /* set the fade target */ |
430 | fadeTarget = tempDimVal2; /* set the fade target */ |
| 431 | 431 | ||
| 432 | if (fadeTarget != dimmerValue) { |
432 | if (fadeTarget != dimmerValue) { |
| 433 | if ((speed&0x80) == |
433 | if ((speed&0x80) == 0x80) { |
| 434 | fadeSpeed = speed |
434 | fadeSpeed = (speed&0x7f)+1; |
| 435 | fadeSpeedFrac = 1; |
435 | fadeSpeedFrac = 1; |
| 436 | } else { |
436 | } else { |
| 437 | fadeSpeed = 1; |
437 | fadeSpeed = 1; |
| 438 | fadeSpeedFrac = speed& |
438 | fadeSpeedFrac = 0x80-(speed&0x7f); |
| 439 | } |
439 | } |
| 440 | if (fadeTarget < dimmerValue) { |
440 | if (fadeTarget < dimmerValue) { |
| 441 | fadeSpeed = -fadeSpeed; |
441 | fadeSpeed = -fadeSpeed; |
| 442 | } |
442 | } |
| 443 | } |
443 | } |