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

+#ifdef CHN_LOADED
+#include "../chn_ChnMaster/chn_ChnMaster.h"
+#endif
+#ifdef CHN_LOADED
+void act_dimmer230_chn_update( uint16_t channel_id, uint16_t value );
+#endif
 int8_t fadeSpeed = 0;
 uint8_t fadeSpeedFrac = 0;
 uint8_t fadeTarget = 0;
 uint8_t fadeSpeedCnt = 0;
 /*  This bool is set to make process routine send the NetInfo packet */
 uint8_t sendNetInfo = 0;
 /*  netConnected stores the connection status, if connected to the net or not */
 uint8_t netConnected = CAN_MODULE_ENUM_DIMMER230_NETINFO_CONNECTION_DISCONNECTED;
 /*  frequency stores the evaluated frequency, 50 or 60 Hz
     don't calculate net frequency since the internal oscillator is not to be trusted, instead check if 50Hz or 60Hz system
     should be used for switching powerStepTable depending on frequency */
 uint8_t frequency = CAN_MODULE_ENUM_DIMMER230_NETINFO_FREQUENCY_ERROR_UNKNOWN;
 /*  zero cross sync (time between pos flank of xc-detection and real zero cross) */
 uint16_t xcTimeDiff=0;
 /*  dimmerValue is the current output
     value of 0 is zero output, value of 255 is max output (ACT_DIMMMER230_MIN_DIM, ACT_DIMMMER230_MAX_DIM)
     stored in eeprom, and restored at startup */
 uint8_t dimmerValue = ACT_DIMMMER230_MIN_DIM;
 uint8_t state = ACT_DIMMMER230_STATE_IDLE;
 /*  powerStepTable is used for stepping the output for constant increase/decrease in power, this should be a quater of a sin^2-wave (since the second quater can be calculated) */
 const uint16_t powerStepTable[] PROGMEM = {845, 1068, 1225, 1352, 1459, 1553, 1638, 1716, 1788, 1855, 1917, 1976, 2032, 2086, 2138, 2188, 2236, 2282, 2327, 2370, 2412, 2453, 2493, 2532, 2570, 2607, 2643, 2679, 2714, 2748, 2782, 2815, 2848, 2880, 2911, 2942, 2972, 3002, 3032, 3061, 3090, 3119, 3147, 3175, 3203, 3230, 3257, 3284, 3311, 3337, 3363, 3389, 3415, 3440, 3465, 3490, 3515, 3539, 3563, 3587, 3611, 3635, 3659, 3682, 3705, 3728, 3751, 3774, 3797, 3820, 3843, 3865, 3887, 3909, 3931, 3953, 3975, 3997, 4019, 4041, 4062, 4083, 4104, 4125, 4146, 4167, 4188, 4209, 4230, 4251, 4272, 4292, 4313, 4333, 4354, 4374, 4395, 4415, 4435, 4455, 4476, 4496, 4516, 4536, 4556, 4576, 4596, 4615, 4635, 4655, 4675, 4694, 4714, 4734, 4754, 4773, 4793, 4813, 4832, 4852, 4872, 4891, 4911, 4931, 4951, 4970, 4990};
 #if act_dimmer230_SYNC>0
 uint8_t zeroCrossCnt = 0;
 #endif
 /*  Set the variable to "disconnected" if no zerocross have arrived for a while */
 void Net_Connection_callback(uint8_t timer)
+{
     netConnected = CAN_MODULE_ENUM_DIMMER230_NETINFO_CONNECTION_DISCONNECTED;
+}
     uint8_t dummycnt = 40;
     while (dummycnt > 0)
+    {
         dummycnt++;
         asm("nop");
         asm("nop");
     }
     gpio_clr_pin(act_dimmer230_CHAN1_IO);
     TIMSK1=0;                           //disable timer interrupt
     state = ACT_DIMMMER230_STATE_IDLE;
+}
+#ifdef CHN_LOADED
+void act_dimmer230_chn_update( uint16_t channel_id, uint16_t value ) {
+    fadeTarget = dimmerValue = value>>8;
+}
+#endif
 /*  Interrupted at a pin change on zero-cross pin
     The zero-cross pin will go high just before the real zero-cross and
     low just after the real zero-cross. The time difference is measured
     and adjusted for. */
+    {
         xcTimeDiff = TCNT1;
         xcTimeDiff = xcTimeDiff >> 1; //divide by two
         if (xcTimeDiff > 600) {
             xcTimeDiff = 600;
         }
     }
     /* only execute if zerocross pin is high (before real zerocross) */
     else
+    {
         /* Reset the timer for checking net connection. If no zero-cross has come in 500ms then consider us disconnected */
         Timer_SetTimeout(act_dimmer230_NET_CONNECT_TIMEOUT, 500, TimerTypeOneShot, &Net_Connection_callback);
         /* Currently we are connected */
         netConnected = CAN_MODULE_ENUM_DIMMER230_NETINFO_CONNECTION_CONNECTED;
         /* Check frequency by measure the time since last zero-cross */
         uint16_t periodTime = TCNT1;
         if (periodTime > ACT_DIMMMER230_50HZ_PERIOD_TIME-ACT_DIMMMER230_50HZ_PERIOD_TIME/10 && periodTime < ACT_DIMMMER230_50HZ_PERIOD_TIME+ACT_DIMMMER230_50HZ_PERIOD_TIME/10)
+        {
             frequency = CAN_MODULE_ENUM_DIMMER230_NETINFO_FREQUENCY_50HZ;
+        }
         else if (periodTime > ACT_DIMMMER230_60HZ_PERIOD_TIME-ACT_DIMMMER230_60HZ_PERIOD_TIME/10 && periodTime < ACT_DIMMMER230_60HZ_PERIOD_TIME+ACT_DIMMMER230_60HZ_PERIOD_TIME/10)
         {
             frequency = CAN_MODULE_ENUM_DIMMER230_NETINFO_FREQUENCY_60HZ;
+        }
         else
+        {
             frequency = CAN_MODULE_ENUM_DIMMER230_NETINFO_FREQUENCY_ERROR_UNKNOWN;
                 fadeSpeed = -fadeSpeed;
             break;
             case ACT_DIMMMER230_DEMO_STATE_INCREASE:
                 demoState = ACT_DIMMMER230_DEMO_STATE_GOBACK;
                 fadeTarget = demoEndValue;
                 fadeSpeed = -fadeSpeed;
             break;
             case ACT_DIMMMER230_DEMO_STATE_GOBACK:
                 demoState = ACT_DIMMMER230_DEMO_STATE_NOT_RUNNING;
             break;
             }
         }
         /* Calculate new time to triac triggering */
         uint16_t newTimerVal = xcTimeDiff;      /* add the zerocross timediff */
         if (dimmerValue > 0 && dimmerValue <= 127)
+        {
             newTimerVal += pgm_read_word(&powerStepTable[254-dimmerValue]);
+        }
         else if (dimmerValue == 255)
+        {
             newTimerVal += 100; /* almost max, to make sure we don't fire before zerocross */
         }
         if (newTimerVal > ACT_DIMMMER230_50HZ_PERIOD_TIME)
+        {
             newTimerVal -= ACT_DIMMMER230_50HZ_PERIOD_TIME;
+        }
             dimmerValue += fadeSpeed;
             if ((fadeSpeed > 0 && (dimmerValue < tempDimVal || dimmerValue >= fadeTarget)) ||
                 (fadeSpeed < 0 && (dimmerValue > tempDimVal || dimmerValue <= fadeTarget)))
+            {
                 dimmerValue = fadeTarget;
             }
             /* if targetvalue was reached then send the netinfo packet */
             if (dimmerValue == fadeTarget)
+            {
                 sendNetInfo = 1;
             }
             /* 5 seconds after we have stopped fading we should store the current dimmerValue to eeprom */
             Timer_SetTimeout(act_dimmer230_STORE_VALUE_TIMEOUT, 5000, TimerTypeOneShot, 0);
         }
 #if act_dimmer230_SYNC>0
         /* Currently disabled, must add this packet to data.xml */
         zeroCrossCnt++;
         if (zeroCrossCnt >= act_dimmer230_SYNC)
+        {
     TIMSK1=0;                           /* disable timer interrupt */
     TCCR1A=0;
     TCCR1B=(1<<CS11);                   /* enable timer, set to prescaler 8, must be changed if cpu freq is changed */
+#ifdef CHN_LOADED
+    chn_ChnMaster_RegisterListener( act_dimmer230_CHN_CHANNEL, act_dimmer230_chn_update );
+#endif
     /* setup interrupt on zerocross, pcint */
     //act_dimmer230_ZC_PCMSK=(1<<(act_dimmer230_ZC_PCINT_BIT));
     //PCIFR=(1<<act_dimmer230_ZC_PCIF); /* clear any pending interrupt before enabling interrupts */
     //PCICR=(1<<act_dimmer230_ZC_PCIE); /* enable interrupt for PCINT */
                 fadeSpeed = 0;
                 uint8_t endValue = 0;
                 if (direction == CAN_MODULE_ENUM_DIMMER230_START_FADE_DIRECTION_INCREASE) {
                     endValue = ACT_DIMMMER230_MAX_DIM;
                 } else if (direction == CAN_MODULE_ENUM_DIMMER230_START_FADE_DIRECTION_DECREASE) {
                     endValue = ACT_DIMMMER230_MIN_DIM;
                 }
                 if (speed == 0) {
                     dimmerValue = endValue; /* set dimmer value immediately */
                     sendNetInfo = 1;        /* send netinfo with the current dimmervalue*/
                 } else {
                     fadeTarget = endValue;
                     if (fadeTarget != dimmerValue) {
                         if ((speed&0x80) == 0x80) {
                             fadeSpeed = (speed&0x7f)+1;
                             fadeSpeedFrac = 1;
                         } else {
                             fadeSpeed = 1;
     txMsg.Data[4] = NUMBER_OF_MODULES;
     txMsg.Data[5] = ModuleSequenceNumber;
     while (StdCan_Put(&txMsg) != StdCan_Ret_OK);
+}

Subversion Repositories HomeAutomation

(root)/trunk/EmbeddedSoftware/AVR/module/act_dimmer230/act_dimmer230.c – Rev 1257 → 1265