Diff: src/OutputTask/OutputTask.cpp

Revision:

152:c03ebcda54ef

Parent:

133:c871de2d2b90

--- a/src/OutputTask/OutputTask.cpp	Tue Sep 27 19:52:47 2016 +0000
+++ b/src/OutputTask/OutputTask.cpp	Wed Sep 28 16:14:47 2016 +0000
@@ -83,7 +83,11 @@
                     if ( rc != 0 ) {
                         logError("%s: failed to enabled output for %s",
                                  __func__, msg->id);
+                    } else {
+                        refreshOutputs(msg->output_tag);
+                        printf("\rCalled from ACTION_CONTROL_ON\n");
                     }
+
                     break;
                 case ACTION_CONTROL_OFF:
                     logInfo("%s is requesting OFF control of %s", msg->id, msg->output_tag);
@@ -91,6 +95,9 @@
                     if ( rc != 0 ) {
                         printf("%s: failed to disabled output for %s",
                                __func__, msg->id);
+                    } else {
+                        refreshOutputs(msg->output_tag);
+                        printf("\rCalled from ACTION_CONTROL_OFF\n");
                     }
                     break;
                 case ACTION_CONTROL_UNREGISTER:
@@ -99,6 +106,10 @@
                     if ( rc != 0 ) {
                         printf("%s: failed to unregister control %s",
                                __func__, msg->id);
+                    } else {
+                        refreshOutputs(msg->output_tag);
+                        printf("\rCalled from ACTION_CONTROL_UNREGISTER\n");
+
                     }
                     break;
                 default:
@@ -109,7 +120,7 @@
             OutputMasterMailBox.free(msg);
 
             // refresh the outputs
-            refreshOutputs(msg->output_tag);
+            //refreshOutputs(msg->output_tag);
         }
     }
 }
@@ -154,31 +165,33 @@
             ModbusMasterReadRegister(output, &output_value);
             ev.inputValue = input_value.value;
             ev.outputValue = output_value.value;
-            printf("\rEVENT RECORD\n");
+            printf("\rEVENT RECORD (SETPOINT CONTROL)\n");
             printf("\rev.eventReason = %d\n", ev.eventReason);
+            printf("\rev.inputTag = %s\n", ev.inputTag);
+            printf("\rev.inputValue = %.02f\n", ev.inputValue);
             printf("\rev.outputTag   = %s\n", ev.outputTag);
             printf("\rev.outputValue = %.02f\n", ev.outputValue);
             EventLoggerApi(ev);
             break;
-            
+
         case CONTROL_MANUAL:
             ev.eventReason = EVENT_REASON_MANUAL;
             strncpy(ev.outputTag, output.c_str(), sizeof(ev.outputTag));
             ModbusMasterReadRegister(output, &output_value);
             ev.outputValue = output_value.value;
-            printf("\rEVENT RECORD\n");
+            printf("\rEVENT RECORD (MANUAL CONTROL)\n");
             printf("\rev.eventReason = %d\n", ev.eventReason);
             printf("\rev.outputTag = %s\n", ev.outputTag);
             printf("\rev.outputValue = %.02f\n", ev.outputValue);
             EventLoggerApi(ev);
             break;
-            
+
         case CONTROL_TIMER:
             ev.eventReason = EVENT_REASON_TIMER;
             strncpy(ev.outputTag, output.c_str(), sizeof(ev.outputTag));
             ModbusMasterReadRegister(output, &output_value);
             ev.outputValue = output_value.value;
-            printf("\rEVENT RECORD\n");
+            printf("\rEVENT RECORD (TIMER CONTROL)\n");
             printf("\rev.eventReason = %d\n", ev.eventReason);
             printf("\rev.outputTag = %s\n", ev.outputTag);
             printf("\rev.outputValue = %.02f\n", ev.outputValue);