WebSVN – HomeAutomation – Diff – /trunk/EmbeddedSoftware/AVR/module/act_hwPWM/act_hwPWM.c

 #include "act_hwPWM.h"
+#include <avr/pgmspace.h>
 uint16_t pwmValue[4];
 uint8_t sendInfo[4] = {0,0,0,0};
 int8_t fadeSpeed[4] = {0,0,0,0};
 uint8_t fadeSpeedCnt[4] = {0,0,0,0};
 uint16_t demoEndValue[4] = {0,0,0,0};
 uint16_t demoHighValue[4] = {0,0,0,0};
-uint8_t demoState[4] = {ACT_HWPWM_DEMO_STATE_NOT_RUNNING, ACT_HWPWM_DEMO_STATE_NOT_RUNNING, ACT_HWPWM_DEMO_STATE_NOT_RUNNING,                   ACT_HWPWM_DEMO_STATE_NOT_RUNNING};
+uint8_t demoState[4] = {ACT_HWPWM_DEMO_STATE_NOT_RUNNING, ACT_HWPWM_DEMO_STATE_NOT_RUNNING, ACT_HWPWM_DEMO_STATE_NOT_RUNNING, ACT_HWPWM_DEMO_STATE_NOT_RUNNING};
+static uint16_t lookuptable[256] PROGMEM =
+{
+,4, 8,12,  17,  21   ,  25   ,  30   ,  34   ,  39   ,  43   ,  48   ,  52   ,  57   ,  62   ,  67   ,  72   ,  77   ,  82   ,  87   ,  93   ,  98   ,  104  ,  109  , 115   ,  120  ,  126  ,  132  ,  138  ,  144  ,  150  ,  156  ,  162  ,  169  ,  175  ,  182  ,  188  ,  195  ,  202  ,  209  ,  216  ,  223  ,  230  ,  237  ,  245  , 252   ,  260  ,  267  ,  275  ,  283  ,  291  ,  299  ,  308  ,  316  ,  325  ,  333  ,  342  ,  351  ,  360  ,  369  ,  378  ,  388  ,  397  ,  407  ,  417  ,  427  , 437   ,  447  ,  457  ,  468  ,  478  ,  489  ,  500  ,  511  ,  523  ,  534  ,  546  ,  557  ,  569  ,  581  ,  594  ,  606  ,  619  ,  632  ,  645  ,  658  ,  671  , 685   ,  698  ,  712  ,  726  ,  741  ,  755  ,  770  ,  785  ,  800  ,  815  ,  831  ,  847  ,  863  ,  879  ,  896  ,  912  ,  929  ,  946  ,  964  ,  982  ,  999  , 1018  ,  1036 ,  1055 ,  1074 ,  1093 ,  1113 ,  1132 ,  1152 ,  1173 ,  1193 ,  1214 ,  1236 ,  1257 ,  1279 ,  1301 ,  1324 ,  1346 ,  1369 ,  1393 ,  1417 ,  1441 , 1465  ,  1490 ,  1515 ,  1540 ,  1566 ,  1593 ,  1619 ,  1646 ,  1673 ,  1701 ,  1729 ,  1758 ,  1787 ,  1816 ,  1846 ,  1876 ,  1907 ,  1938 ,  1969 ,  2001 ,  2033 , 2066  ,  2099 ,  2133 ,  2167 ,  2202 ,  2237 ,  2273 ,  2309 ,  2346 ,  2383 ,  2421 ,  2459 ,  2498 ,  2538 ,  2577 ,  2618 ,  2659 ,  2701 ,  2743 ,  2786 ,  2829 , 2873  ,  2918 ,  2963 ,  3009 ,  3056 ,  3103 ,  3151 ,  3200 ,  3249 ,  3299 ,  3350 ,  3402 ,  3454 ,  3507 ,  3560 ,  3615 ,  3670 ,  3726 ,  3783 ,  3840 ,  3899 , 3958  ,  4018 ,  4079 ,  4141 ,  4203 ,  4267 ,  4331 ,  4397 ,  4463 ,  4530 ,  4598 ,  4667 ,  4737 ,  4808 ,  4881 ,  4954 ,  5028 ,  5103 ,  5179 ,  5257 ,  5335 , 5415  ,  5495 ,  5577 ,  5660 ,  5744 ,  5830 ,  5916 ,  6004 ,  6093 ,  6183 ,  6275 ,  6368 ,  6462 ,  6557 ,  6654 ,  6752 ,  6852 ,  6953 ,  7055 ,  7159 ,  7265 , 7371  ,  7480 ,  7590 ,  7701 ,  7814 ,  7929 ,  8045 ,  8163 ,  8283 ,  8404 , 8527  ,  8652 ,  8778 ,  8906 ,  9036 ,  9168 ,  9302 ,  9438 ,  9575 ,  9715 , 9856  ,
+,
+};
 #if act_hwPWM_USEEEPROM==1
 #include "act_hwPWM_eeprom.h"
 struct eeprom_act_hwPWM EEMEM eeprom_act_hwPWM =
+{
         /* Check demo states */
         if (pwmValue[channel] == fadeTarget[channel]) {
             switch (demoState[channel])
+            {
             case ACT_HWPWM_DEMO_STATE_NOT_RUNNING:
             break;
             case ACT_HWPWM_DEMO_STATE_DECREASE:
                 demoState[channel] = ACT_HWPWM_DEMO_STATE_INCREASE;
                 fadeTarget[channel] = demoHighValue[channel];
                 fadeSpeed[channel] = -fadeSpeed[channel];
             break;
             case ACT_HWPWM_DEMO_STATE_INCREASE:
                 demoState[channel] = ACT_HWPWM_DEMO_STATE_GOBACK;
                 fadeTarget[channel] = demoEndValue[channel];
                 fadeSpeed[channel] = -fadeSpeed[channel];
             break;
             case ACT_HWPWM_DEMO_STATE_GOBACK:
                 demoState[channel] = ACT_HWPWM_DEMO_STATE_NOT_RUNNING;
             break;
             }
         }
         /* Change the dimmerValue according to the current fading */
         fadeSpeedCnt[channel]++;
         if (fadeSpeedCnt[channel] == fadeSpeedFrac[channel] && pwmValue[channel] != (fadeTarget[channel]))
+        {
     #endif
     /* enable outputs for timer 1 */
     #if act_hwPWM_CH1_COM>0
     gpio_set_out(EXP_B);
     #endif
     #if act_hwPWM_CH2_COM>0
     gpio_set_out(EXP_C);
     #endif
     /* set up counter mode for timer 1 */
     #if act_hwPWM_CH1_COM>0 || act_hwPWM_CH2_COM>0
     if (pwmValue[1]>0)
+    {
         TCCR1A|=(act_hwPWM_CH2_COM<<COM1A0);
+    }
     ICR1 = 0xffff;
     #endif
     /* enable timer 1 */
     #if act_hwPWM_CH1_COM>0
     TCCR1B|=(act_hwPWM_CH1_CS<<CS10);
     #elif act_hwPWM_CH2_COM>0
     TCCR1B|=(act_hwPWM_CH2_CS<<CS10);
     #endif
     /* set up waveform generation mode for timer 0 */
     #if act_hwPWM_CH3_COM>0
     TCCR0A=((act_hwPWM_CH3_WGM&0x03)<<WGM00);
     TCCR0B=(((act_hwPWM_CH3_WGM>>2)&0x01)<<WGM02);
     #elif act_hwPWM_CH4_COM>0
     TCCR0A=((act_hwPWM_CH4_WGM&0x03)<<WGM00);
     TCCR0B=(((act_hwPWM_CH4_WGM>>2)&0x01)<<WGM02);
     #if act_hwPWM_CH3_COM>0
     gpio_set_out(EXP_F);
     #endif
     #if act_hwPWM_CH4_COM>0
     gpio_set_out(EXP_G);
     #endif
     /* set up counter mode for timer 0 */
     #if act_hwPWM_CH3_COM>0 || act_hwPWM_CH4_COM>0
     if (pwmValue[2]>0)
+    {
         TCCR0A|=(act_hwPWM_CH3_COM<<COM0A0);
     }
     if (pwmValue[3]>0)
+    {
         TCCR0A|=(act_hwPWM_CH4_COM<<COM0B0);
     }
     #endif
     /* enable timer 0 */
     #if act_hwPWM_CH3_COM>0
     TCCR0B|=(act_hwPWM_CH3_CS<<CS00);
     #elif act_hwPWM_CH4_COM>0
     Timer_SetTimeout(act_hwPWM_SEND_STATUS_TIMEOUT, act_hwPWM_SEND_STATUS_INTERVAL_S*1000, TimerTypeFreeRunning, 0);
     //printf("Hello world!\n");
+}
 uint8_t channel_to_send = 1;
 void act_hwPWM_Process(void)
 {
     if (Timer_Expired(act_hwPWM_SEND_STATUS_TIMEOUT))
+    {
         if (channel_to_send >4) {
           #if act_hwPWM_CH1_COM==0
           channel_to_send = 2;
               #if act_hwPWM_CH2_COM==0
               channel_to_send = 3;
               #if act_hwPWM_CH3_COM==0
                   channel_to_send = 4;
               #else
                   channel_to_send=3;
                 #endif
               #else
                   channel_to_send=2;
             #endif
             eeprom_write_word_crc(EEDATA16.ch4, pwmValue[3], WITH_CRC);
+        }
+    }
 #if act_hwPWM_CH1_COM>0
+# if act_hwPWM_CH1_LED>0
+#  define CH1_calculation ((lookuptable[pwmValue[0]/39-1]*act_hwPWM_CH1_FACT)>>8)
+# else
-    if (OCR_1 != (uint16_t)(pwmValue[0]*act_hwPWM_CH1_FACT)>>8) {
+#  define CH1_calculation ((pwmValue[0]*act_hwPWM_CH1_FACT)>>8)
+# endif
+    if (OCR_1 != (uint16_t)CH1_calculation) {
         cli();
-        OCR_1=(uint16_t)(pwmValue[0]*act_hwPWM_CH1_FACT)>>8;
+        OCR_1=(uint16_t)CH1_calculation;
         if (OCR_1==0)
+        {
             TCCR1A&=~((1<<COM1B0)|(1<<COM1B1));
         }
         else
+        {
             TCCR1A|=(act_hwPWM_CH1_COM<<COM1B0);
         }
         sei();
         Timer_SetTimeout(act_hwPWM_STORE_VALUE_TIMEOUT, act_hwPWM_STORE_VALUE_TIMEOUT_TIME*1000, TimerTypeOneShot, 0);
+    }
 #endif
 #if act_hwPWM_CH2_COM>0
+# if act_hwPWM_CH2_LED>0
+#  define CH2_calculation ((uint32_t)((lookuptable[pwmValue[1]/39-1]*act_hwPWM_CH2_FACT)>>8))
+# else
-    if (OCR_2 != (uint16_t)((uint32_t)pwmValue[1]*act_hwPWM_CH2_FACT)>>8) {
+#  define CH2_calculation ((uint32_t)((pwmValue[1]*act_hwPWM_CH2_FACT)>>8))
+# endif
+    if (OCR_2 != (uint16_t)CH2_calculation) {
         cli();
-        OCR_2=(uint16_t)(((uint32_t)pwmValue[1]*act_hwPWM_CH2_FACT)>>8);
+        OCR_2=(uint16_t)CH2_calculation;
         if (OCR_2==0)
+        {
             TCCR1A&=~((1<<COM1A0)|(1<<COM1A1));
-        }
-        else
-        {
-            TCCR1A|=(act_hwPWM_CH2_COM<<COM1A0);
+        }
+        else
+        {
+            TCCR1A|=(act_hwPWM_CH2_COM<<COM1A0);
+        }
         sei();
         Timer_SetTimeout(act_hwPWM_STORE_VALUE_TIMEOUT, act_hwPWM_STORE_VALUE_TIMEOUT_TIME*1000, TimerTypeOneShot, 0);
+    }
 #endif
 #if act_hwPWM_CH3_COM>0
+# if act_hwPWM_CH3_LED>0
+#  define CH3_calculation ((lookuptable[pwmValue[2]/39-1]*act_hwPWM_CH3_FACT)>>8)
+# else
-    if (OCR_3 != (uint16_t)(pwmValue[2]*act_hwPWM_CH3_FACT)>>8) {
+#  define CH3_calculation ((pwmValue[2]*act_hwPWM_CH3_FACT)>>8)
+# endif
+    if (OCR_3 != (uint16_t)CH3_calculation) {
         cli();
-        OCR_3=(uint16_t)(pwmValue[2]*act_hwPWM_CH3_FACT)>>8;
+        OCR_3=(uint16_t)CH3_calculation;
         if (OCR_3==0)
+        {
             TCCR0A &= ~((1<<COM0A0)|(1<<COM0A1));
+        }
         else
         sei();
         Timer_SetTimeout(act_hwPWM_STORE_VALUE_TIMEOUT, act_hwPWM_STORE_VALUE_TIMEOUT_TIME*1000, TimerTypeOneShot, 0);
+    }
 #endif
 #if act_hwPWM_CH4_COM>0
+# if act_hwPWM_CH4_LED>0
+#  define CH4_calculation ((lookuptable[pwmValue[3]/39-1]*act_hwPWM_CH4_FACT)>>8)
+# else
-    if (OCR_4 != (uint16_t)(pwmValue[3]*act_hwPWM_CH4_FACT)>>8) {
+#  define CH4_calculation ((pwmValue[3]*act_hwPWM_CH4_FACT)>>8)
+# endif
+    if (OCR_4 != (uint16_t)CH4_calculation) {
         cli();
-        OCR_4=(uint16_t)(pwmValue[3]*act_hwPWM_CH4_FACT)>>8;
+        OCR_4=(uint16_t)CH4_calculation;
         if (OCR_4==0)
+        {
             TCCR0A &= ~((1<<COM0B0)|(1<<COM0B1));
+        }
         else

Subversion Repositories HomeAutomation

(root)/trunk/EmbeddedSoftware/AVR/module/act_hwPWM/act_hwPWM.c – Rev 2012 → 2064