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

 /*-----------------------------------------------------------------------------
  * Variables
  *---------------------------------------------------------------------------*/
-static uint8_t outputStateTarget[act_protectedOutput_CH_COUNT];
+static uint8_t chTargetState[act_protectedOutput_CH_COUNT];
 static uint8_t diagState = DIAG_NORMAL;
 // is there a recent status change that we should report via CAN?
 static uint8_t diagReportPending = 0;
 /*-----------------------------------------------------------------------------
  * Internal Function Prototypes
  *---------------------------------------------------------------------------*/
-static void updateOutput(void);
+static void updateOutput(uint8_t skipDiagCheck);
 static void readDiagPin(void);
 static void pcIntCallback(uint8_t id, uint8_t status);
 /*-----------------------------------------------------------------------------
  * Function Implementations
  *---------------------------------------------------------------------------*/
-static void updateOutput() {
+static void updateOutput(uint8_t skipDiagCheck) {
     #if act_protectedOutput_CH_COUNT >= 1
-    if (outputStateTarget[0] == 0) {
+    if (chTargetState[0] == 0) {
         gpio_set_statement(CH0_OFF, CH0_PIN);
+    }
-    else if (outputStateTarget[0] == 1) {
+    else if (chTargetState[0] == 1) {
-        if (diagState == DIAG_NORMAL) {
+        if (diagState == DIAG_NORMAL || skipDiagCheck) {
             gpio_set_statement(CH0_ON, CH0_PIN);
         }
         else {
             // DIAG override, we cannot set ON state right now
             gpio_set_statement(CH0_OFF, CH0_PIN);
+        }
     }
     #endif
     #if act_protectedOutput_CH_COUNT >= 2
-    if (outputStateTarget[1] == 0) {
+    if (chTargetState[1] == 0) {
         gpio_set_statement(CH1_OFF, CH1_PIN);
     }
-    else if (outputStateTarget[1] == 1) {
+    else if (chTargetState[1] == 1) {
-        if (diagState == DIAG_NORMAL) {
+        if (diagState == DIAG_NORMAL || skipDiagCheck) {
             gpio_set_statement(CH1_ON, CH1_PIN);
+        }
         else {
             // DIAG override, we cannot set ON state right now
             gpio_set_statement(CH1_OFF, CH1_PIN);
         }
+    }
     #endif
     #if act_protectedOutput_CH_COUNT >= 3
-    if (outputStateTarget[2] == 0) {
+    if (chTargetState[2] == 0) {
         gpio_set_statement(CH2_OFF, CH2_PIN);
+    }
-    else if (outputStateTarget[2] == 1) {
+    else if (chTargetState[2] == 1) {
-        if (diagState == DIAG_NORMAL) {
+        if (diagState == DIAG_NORMAL || skipDiagCheck) {
             gpio_set_statement(CH2_ON, CH2_PIN);
+        }
         else {
             // DIAG override, we cannot set ON state right now
             gpio_set_statement(CH2_OFF, CH2_PIN);
+        }
+    }
     #endif
     #if act_protectedOutput_CH_COUNT >= 4
-    if (outputStateTarget[3] == 0) {
+    if (chTargetState[3] == 0) {
         gpio_set_statement(CH3_OFF, CH3_PIN);
+    }
-    else if (outputStateTarget[3] == 1) {
+    else if (chTargetState[3] == 1) {
-        if (diagState == DIAG_NORMAL) {
+        if (diagState == DIAG_NORMAL || skipDiagCheck) {
             gpio_set_statement(CH3_ON, CH3_PIN);
         }
         else {
             // DIAG override, we cannot set ON state right now
             gpio_set_statement(CH3_OFF, CH3_PIN);
         }
+    }
     #endif
+}
 static void readDiagPin() {
     diagState = gpio_get_state(DIAG_PIN);
 }
 static void pcIntCallback(uint8_t id, uint8_t status) {
     // new state of the DIAG pin?
     if (id == act_protectedOutput_DIAG_PIN_PCINT) {
         diagState = status;
-        updateOutput();
+        updateOutput(0);
         // DIAG asserted?
         if (diagState == DIAG_ASSERTED) {
             // if retry-timer mechanism is enabled, initiate timer
             if (act_protectedOutput_RETRY_TIMER_TIME_S > 0) {
                 Timer_SetTimeout(act_protectedOutput_RETRY_TIMER, act_protectedOutput_RETRY_TIMER_TIME_S*1000, TimerTypeOneShot, 0);
+            }
             // if the retry-mechanism is disabled, change the target output state to OFF
             else {
                 for (uint8_t i=0; i<act_protectedOutput_CH_COUNT; i++) {
-                    outputStateTarget[i] = 0;
+                    chTargetState[i] = 0;
                 }
+#if act_protectedOutput_EEPROM_ENABLED == 1
+                // output states changed, store to EE after this timer delay
+                Timer_SetTimeout(act_protectedOutput_STORE_VALUE_TIMEOUT, act_protectedOutput_STORE_VALUE_TIMEOUT_TIME_S*1000, TimerTypeOneShot, 0);
+#endif
+            }
+        }
         // something interesting obviously happened. let's report it
         diagReportPending = 1;
+    }
 }
 void act_protectedOutput_Init() {
     /*
      * Init target state vector, in case EEPROM is disabled
      */
     for (uint8_t i=0; i<act_protectedOutput_CH_COUNT; i++) {
-        outputStateTarget[i] = 0;
+        chTargetState[i] = 0;
     }
     /*
      * Configure DIAG input pin
      */
     if (act_protectedOutput_DIAG_PIN_PULL_ENABLED) {
         // if DIAG is asserted low, we need pull-up
         gpio_set_statement(act_protectedOutput_DIAG_PIN_POLARITY == 0 ? 1 : 0, DIAG_PIN);
+    }
     gpio_set_in(DIAG_PIN);
      * Read EEPROM data
      */
 #if act_protectedOutput_EEPROM_ENABLED == 1
     if (EEDATA_OK) {
 #if act_protectedOutput_CH_COUNT >= 1
-      outputStateTarget[0] = eeprom_read_byte(EEDATA.ch0);
+      chTargetState[0] = eeprom_read_byte(EEDATA.ch0);
 #endif
 #if act_protectedOutput_CH_COUNT >= 2
-      outputStateTarget[1] = eeprom_read_byte(EEDATA.ch1);
+      chTargetState[1] = eeprom_read_byte(EEDATA.ch1);
 #endif
 #if act_protectedOutput_CH_COUNT >= 3
-      outputStateTarget[2] = eeprom_read_byte(EEDATA.ch2);
+      chTargetState[2] = eeprom_read_byte(EEDATA.ch2);
 #endif
 #if act_protectedOutput_CH_COUNT >= 4
-      outputStateTarget[3] = eeprom_read_byte(EEDATA.ch3);
+      chTargetState[3] = eeprom_read_byte(EEDATA.ch3);
 #endif
+    }
     else {
         //The CRC of the EEPROM is not correct, store default values and update CRC
 #if act_protectedOutput_CH_COUNT >= 1
         eeprom_write_byte_crc(EEDATA.ch0, 0x00, WITHOUT_CRC);
 #endif
 #if act_protectedOutput_CH_COUNT >= 2
         eeprom_write_byte_crc(EEDATA.ch1, 0x00, WITHOUT_CRC);
 #endif
 #if act_protectedOutput_CH_COUNT >= 3
         eeprom_write_byte_crc(EEDATA.ch2, 0x00, WITHOUT_CRC);
 #endif
      * Configure OUTPUT pins
      */
     #if act_protectedOutput_CH_COUNT >= 1
     gpio_set_statement(CH0_OFF, CH0_PIN);
     gpio_set_out(act_protectedOutput_CH0);
     #endif
     #if act_protectedOutput_CH_COUNT >= 2
     gpio_set_statement(CH1_OFF, CH1_PIN);
     gpio_set_out(act_protectedOutput_CH1);
     #endif
     #if act_protectedOutput_CH_COUNT >= 3
     gpio_set_statement(CH2_OFF, CH2_PIN);
     gpio_set_out(act_protectedOutput_CH2);
     #endif
     #if act_protectedOutput_CH_COUNT >= 4
     gpio_set_statement(CH3_OFF, CH3_PIN);
     gpio_set_out(act_protectedOutput_CH3);
     #endif
 void act_protectedOutput_Process() {
 #if act_protectedOutput_EEPROM_ENABLED == 1
     if (Timer_Expired(act_protectedOutput_STORE_VALUE_TIMEOUT)) {
 #if act_protectedOutput_CH_COUNT >= 1
-        eeprom_write_byte_crc(EEDATA.ch0, outputStateTarget[0], WITHOUT_CRC);
+        eeprom_write_byte_crc(EEDATA.ch0, chTargetState[0], WITHOUT_CRC);
 #endif
 #if act_protectedOutput_CH_COUNT >= 2
-        eeprom_write_byte_crc(EEDATA.ch1, outputStateTarget[1], WITHOUT_CRC);
+        eeprom_write_byte_crc(EEDATA.ch1, chTargetState[1], WITHOUT_CRC);
 #endif
 #if act_protectedOutput_CH_COUNT >= 3
-        eeprom_write_byte_crc(EEDATA.ch2, outputStateTarget[2], WITHOUT_CRC);
+        eeprom_write_byte_crc(EEDATA.ch2, chTargetState[2], WITHOUT_CRC);
 #endif
 #if act_protectedOutput_CH_COUNT >= 4
-        eeprom_write_byte_crc(EEDATA.ch3, outputStateTarget[3], WITHOUT_CRC);
+        eeprom_write_byte_crc(EEDATA.ch3, chTargetState[3], WITHOUT_CRC);
 #endif
         EEDATA_UPDATE_CRC;
     }
 #endif
     // shall we retry to set target output state?
     if (Timer_Expired(act_protectedOutput_RETRY_TIMER)) {
         // read DIAG pin again and update outputs accordingly
         readDiagPin();
+#if act_protectedOutput_FORCED_RETRIES == 1
+        // forced retry to set output states, regardless of DIAG
-        updateOutput();
+        updateOutput(1);
+        // read DIAG pin again and hope we have a better flag
+        readDiagPin();
+#else
+        // if DIAG allows it, retry to set the output states
+        updateOutput(0);
+#endif
         if (diagState == DIAG_ASSERTED) {
             // if DIAG was still asserted, initiate another timer run
             Timer_SetTimeout(act_protectedOutput_RETRY_TIMER, act_protectedOutput_RETRY_TIMER_TIME_S*1000, TimerTypeOneShot, 0);
+        }
         else {
                  * an output channel.
                  */
                 if (rxMsg->Length == 2) {
                     uint8_t channel = rxMsg->Data[0];
                     if (channel >= 0 && channel < act_protectedOutput_CH_COUNT) {
-                        outputStateTarget[channel] = rxMsg->Data[1];
+                        chTargetState[channel] = rxMsg->Data[1];
                         readDiagPin();
+#if act_protectedOutput_FORCED_RETRIES == 1
+                        updateOutput(1);
+#else
-                        updateOutput();
+                        updateOutput(0);
+#endif
 #if act_protectedOutput_EEPROM_ENABLED == 1
-                        // output states changed, store to EE after thie timer delay
+                        // output states changed, store to EE after this timer delay
                         Timer_SetTimeout(act_protectedOutput_STORE_VALUE_TIMEOUT, act_protectedOutput_STORE_VALUE_TIMEOUT_TIME_S*1000, TimerTypeOneShot, 0);
 #endif
+                    }
                     StdCan_Set_direction(rxMsg->Header, DIRECTIONFLAG_FROM_OWNER);
                     rxMsg->Length = 2;

Subversion Repositories HomeAutomation

(root)/trunk/EmbeddedSoftware/AVR/module/act_protectedOutput/act_protectedOutput.c – Rev 1535 → 1537