Rev 894 | Rev 896 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | SVN | RSS feed
| Rev 894 | Rev 895 | ||
|---|---|---|---|
| Line 46... | Line 46... | ||
| 46 | 46 | ||
| 47 | //here new timer value is calculated |
47 | //here new timer value is calculated |
| 48 | 48 | ||
| 49 | if (dimmerValue > 0 && dimmerValue < 127) |
49 | if (dimmerValue > 0 && dimmerValue < 127) |
| 50 | { |
50 | { |
| 51 | newTimerVal += pgm_read_word(&powerStepTable[dimmerValue-1]); |
51 | newTimerVal += ACT_DIMMMER230_PERIOD_TIME - pgm_read_word(&powerStepTable[dimmerValue-1]); |
| 52 | } |
52 | } |
| 53 | else if (dimmerValue < 255) |
53 | else if (dimmerValue < 255) |
| 54 | { |
54 | { |
| 55 | newTimerVal += |
55 | newTimerVal += pgm_read_word(&powerStepTable[254-dimmerValue]); |
| 56 | } |
56 | } |
| 57 | else if (dimmerValue == 255) |
57 | else if (dimmerValue == 255) |
| 58 | { |
58 | { |
| 59 | newTimerVal += |
59 | newTimerVal += 100; //almost max, to make sure we don't fire before zerocross |
| 60 | } |
60 | } |
| 61 | 61 | ||
| 62 | if ( |
62 | if (newTimerVal > ACT_DIMMMER230_PERIOD_TIME) |
| 63 | { |
63 | { |
| 64 | //TODO: this will probably end up out of sync, not a good solution? |
- | |
| 65 |
|
64 | newTimerVal -= ACT_DIMMMER230_PERIOD_TIME; |
| 66 | } |
65 | } |
| - | 66 | ||
| 67 | |
67 | if (dimmerValue > 0) |
| 68 | { |
68 | { |
| 69 | TCNT1 = 0; //reset timer1 count register |
69 | TCNT1 = 0; //reset timer1 count register |
| 70 | OCR1A = newTimerVal; |
70 | OCR1A = newTimerVal; |
| 71 | 71 | ||
| 72 | //enable timer and timer interrupt |
72 | //enable timer and timer interrupt |