Changeset 14415 for trunk

Timestamp:

09/19/12 21:21:26 (12 years ago)

Author:

tbretz

Message:

Better check for outside temperature difference warning; fixed the 'Idle []' problem

File:

• trunk/FACT++/src/smartfact.cc (modified) (2 diffs)

trunk/FACT++/src/smartfact.cc

@@ -2271 +2271 @@
                            "Wind gusts exceed 50km/h during tracking");
 
-        newerr |= SetError(fFscControlTemperatureHist.size()>0 && fFscControlTemperatureHist.back()>8,
+        newerr |= SetError(fDimFscControl.state()>=FSC::State::kConnected && fFscControlTemperatureHist.size()>0 && fFscControlTemperatureHist.back()>8,
                            "Sensor temperature exceeds outside temperature by more than 8°C");
 
@@ -2383 +2383 @@
             if (!other)
             {
+                const string conf = fMcpConfigurationName.length()>0?" ["+fMcpConfigurationName+"]":"";
                 switch (fMcpConfigurationState)
                 {
                 case MCP::State::kIdle:
-                    out << "Idle [" << fMcpConfigurationName << "]";
+                    out << "Idle" << conf;
                     break;
                 case MCP::State::kConfiguring1:
                 case MCP::State::kConfiguring2:
                 case MCP::State::kConfiguring3:
-                    out << "Configuring [" << fMcpConfigurationName << "]";
+                    out << "Configuring" << conf;
                     break;
                 case MCP::State::kConfigured:
-                    out << "Configured [" << fMcpConfigurationName << "]";
+                    out << "Configured" << conf;
                     break;
                 case MCP::State::kTriggerOn: