Index: /trunk/FACT++/gui/FactGui.h
===================================================================
--- /trunk/FACT++/gui/FactGui.h	(revision 12651)
+++ /trunk/FACT++/gui/FactGui.h	(revision 12652)
@@ -433,4 +433,6 @@
 
     DimStampedInfo fDimRateScan;
+
+    DimStampedInfo fDimMagicWeather;
 
     map<string, DimInfo*> fServices;
@@ -2756,4 +2758,21 @@
     }
 
+    // ===================== MAGIC Weather ==================================
+
+    void handleMagicWeather(const DimData &d)
+    {
+        if (!CheckSize(d, 6*sizeof(float)+sizeof(uint16_t)))
+            return;
+
+        const float *ptr = d.ptr<float>(2);
+
+        fMagicTemp->setValue(ptr[0]);
+        fMagicDew->setValue(ptr[1]);
+        fMagicHum->setValue(ptr[2]);
+        fMagicPressure->setValue(ptr[3]);
+        fMagicWind->setValue(ptr[4]);
+        fMagicWindDir->setValue(ptr[5]);
+    }
+
     // ========================== FSC =======================================
 
@@ -3417,4 +3436,7 @@
         if (getInfo()==&fDimRateScan)
             return PostInfoHandler(&FactGui::handleRateScan);
+
+        if (getInfo()==&fDimMagicWeather)
+            return PostInfoHandler(&FactGui::handleMagicWeather);
 
 //        if (getInfo()==&fDimFadFiles)
@@ -3999,4 +4021,6 @@
         fDimRateScan           ("RATE_SCAN/DATA",                 (void*)NULL, 0, this),
         //-
+        fDimMagicWeather       ("MAGIC_WEATHER/DATA",             (void*)NULL, 0, this),
+        //-
         fEventData(0), fDrsCalibration(1440*1024*6+160*1024*2),
 	fTimeStamp0(0)
Index: /trunk/FACT++/gui/design.ui
===================================================================
--- /trunk/FACT++/gui/design.ui	(revision 12651)
+++ /trunk/FACT++/gui/design.ui	(revision 12652)
@@ -11,6 +11,6 @@
     <x>0</x>
     <y>0</y>
-    <width>1381</width>
-    <height>937</height>
+    <width>1383</width>
+    <height>931</height>
    </rect>
   </property>
@@ -53,5 +53,5 @@
       </property>
       <property name="currentIndex">
-       <number>8</number>
+       <number>7</number>
       </property>
       <property name="documentMode">
@@ -64,115 +64,4 @@
        <bool>true</bool>
       </property>
-      <widget class="QWidget" name="tab">
-       <attribute name="title">
-        <string>Drive</string>
-       </attribute>
-       <layout class="QGridLayout" name="gridLayout_98">
-        <item row="0" column="0">
-         <widget class="QDockWidget" name="fDriveDock">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="features">
-           <set>QDockWidget::NoDockWidgetFeatures</set>
-          </property>
-          <property name="allowedAreas">
-           <set>Qt::AllDockWidgetAreas</set>
-          </property>
-          <property name="windowTitle">
-           <string>Drive controls</string>
-          </property>
-          <widget class="QWidget" name="fDriveWidget">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <layout class="QGridLayout" name="gridLayout_97" rowstretch="0,0" columnstretch="0,0">
-            <item row="0" column="1">
-             <widget class="QGroupBox" name="groupBox_27">
-              <property name="title">
-               <string>TPoint LEDs</string>
-              </property>
-              <layout class="QGridLayout" name="gridLayout_105">
-               <item row="0" column="1">
-                <widget class="QSpinBox" name="spinBox">
-                 <property name="alignment">
-                  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                 </property>
-                 <property name="specialValueText">
-                  <string>off</string>
-                 </property>
-                 <property name="maximum">
-                  <number>32767</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="1">
-                <widget class="QSpinBox" name="spinBox_2">
-                 <property name="alignment">
-                  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                 </property>
-                 <property name="specialValueText">
-                  <string>off</string>
-                 </property>
-                 <property name="maximum">
-                  <number>32767</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="0">
-                <widget class="QLabel" name="label_250">
-                 <property name="text">
-                  <string>Top</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="0">
-                <widget class="QLabel" name="label_251">
-                 <property name="text">
-                  <string>Bottom</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item row="0" column="0">
-             <spacer name="horizontalSpacer_63">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-            <item row="1" column="0">
-             <spacer name="verticalSpacer_90">
-              <property name="orientation">
-               <enum>Qt::Vertical</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>20</width>
-                <height>40</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </widget>
-         </widget>
-        </item>
-       </layout>
-      </widget>
       <widget class="QWidget" name="fTriggerTab">
        <attribute name="title">
@@ -2876,6 +2765,6 @@
           <property name="minimumSize">
            <size>
-            <width>214</width>
-            <height>687</height>
+            <width>224</width>
+            <height>710</height>
            </size>
           </property>
@@ -3895,6 +3784,6 @@
           <property name="minimumSize">
            <size>
-            <width>834</width>
-            <height>290</height>
+            <width>905</width>
+            <height>296</height>
            </size>
           </property>
@@ -4270,4 +4159,7 @@
                     <string> V</string>
                    </property>
+                   <property name="decimals">
+                    <number>3</number>
+                   </property>
                    <property name="maximum">
                     <double>90.000000000000000</double>
@@ -4394,4 +4286,7 @@
                    <property name="suffix">
                     <string> V</string>
+                   </property>
+                   <property name="decimals">
+                    <number>3</number>
                    </property>
                    <property name="maximum">
@@ -4479,4 +4374,7 @@
                       <string> V</string>
                      </property>
+                     <property name="decimals">
+                      <number>3</number>
+                     </property>
                      <property name="maximum">
                       <double>9999.000000000000000</double>
@@ -4591,4 +4489,7 @@
                      <property name="suffix">
                       <string> V</string>
+                     </property>
+                     <property name="decimals">
+                      <number>3</number>
                      </property>
                      <property name="minimum">
@@ -5044,6 +4945,6 @@
           <property name="minimumSize">
            <size>
-            <width>1137</width>
-            <height>564</height>
+            <width>1048</width>
+            <height>514</height>
            </size>
           </property>
@@ -5075,6 +4976,6 @@
               <property name="minimumSize">
                <size>
-                <width>500</width>
-                <height>500</height>
+                <width>450</width>
+                <height>450</height>
                </size>
               </property>
@@ -5214,6 +5115,6 @@
               <property name="minimumSize">
                <size>
-                <width>500</width>
-                <height>500</height>
+                <width>450</width>
+                <height>450</height>
                </size>
               </property>
@@ -5561,4 +5462,7 @@
                 </property>
                 <layout class="QGridLayout" name="gridLayout_43">
+                 <property name="leftMargin">
+                  <number>4</number>
+                 </property>
                  <item row="1" column="0">
                   <layout class="QGridLayout" name="gridLayout_38">
@@ -7925,34 +7829,12 @@
                     </widget>
                    </item>
-                   <item row="5" column="1">
-                    <spacer name="verticalSpacer_3">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QGroupBox" name="groupBox_29">
-                  <property name="title">
-                   <string>Drs Calibration</string>
-                  </property>
-                  <layout class="QGridLayout" name="gridLayout_107">
-                   <item row="1" column="1">
+                   <item row="6" column="1">
                     <widget class="QPushButton" name="fDrsCalibStart2">
                      <property name="text">
-                      <string>Start</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="2" column="1">
+                      <string>DRS Cal</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="8" column="1">
                     <widget class="QSpinBox" name="fDrsCalibBaseline2">
                      <property name="alignment">
@@ -7982,5 +7864,5 @@
                     </widget>
                    </item>
-                   <item row="3" column="1">
+                   <item row="9" column="1">
                     <widget class="QSpinBox" name="fDrsCalibGain2">
                      <property name="alignment">
@@ -8010,68 +7892,5 @@
                     </widget>
                    </item>
-                   <item row="4" column="1">
-                    <widget class="QSpinBox" name="fDrsCalibTrgOffset2">
-                     <property name="alignment">
-                      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                     </property>
-                     <property name="readOnly">
-                      <bool>true</bool>
-                     </property>
-                     <property name="buttonSymbols">
-                      <enum>QAbstractSpinBox::NoButtons</enum>
-                     </property>
-                     <property name="specialValueText">
-                      <string>n/a</string>
-                     </property>
-                     <property name="prefix">
-                      <string/>
-                     </property>
-                     <property name="minimum">
-                      <number>-1</number>
-                     </property>
-                     <property name="maximum">
-                      <number>9999</number>
-                     </property>
-                     <property name="value">
-                      <number>-1</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="5" column="1">
-                    <widget class="QPushButton" name="fDrsCalibReset2">
-                     <property name="text">
-                      <string>Reset</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="6" column="1">
-                    <widget class="QSpinBox" name="fDrsCalibROI2">
-                     <property name="alignment">
-                      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                     </property>
-                     <property name="readOnly">
-                      <bool>true</bool>
-                     </property>
-                     <property name="buttonSymbols">
-                      <enum>QAbstractSpinBox::NoButtons</enum>
-                     </property>
-                     <property name="specialValueText">
-                      <string>n/a</string>
-                     </property>
-                     <property name="prefix">
-                      <string/>
-                     </property>
-                     <property name="minimum">
-                      <number>-1</number>
-                     </property>
-                     <property name="maximum">
-                      <number>9999</number>
-                     </property>
-                     <property name="value">
-                      <number>-1</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="1" column="0">
+                   <item row="6" column="0">
                     <widget class="QPushButton" name="fFadLedFileFormatCalib">
                      <property name="enabled">
@@ -8111,5 +7930,5 @@
                     </widget>
                    </item>
-                   <item row="2" column="0">
+                   <item row="8" column="0">
                     <widget class="QPushButton" name="fFadLedDrsBaseline">
                      <property name="enabled">
@@ -8149,5 +7968,5 @@
                     </widget>
                    </item>
-                   <item row="3" column="0">
+                   <item row="9" column="0">
                     <widget class="QPushButton" name="fFadLedDrsGain">
                      <property name="enabled">
@@ -8187,5 +8006,33 @@
                     </widget>
                    </item>
-                   <item row="4" column="0">
+                   <item row="10" column="1">
+                    <widget class="QSpinBox" name="fDrsCalibTrgOffset2">
+                     <property name="alignment">
+                      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                     </property>
+                     <property name="readOnly">
+                      <bool>true</bool>
+                     </property>
+                     <property name="buttonSymbols">
+                      <enum>QAbstractSpinBox::NoButtons</enum>
+                     </property>
+                     <property name="specialValueText">
+                      <string>n/a</string>
+                     </property>
+                     <property name="prefix">
+                      <string/>
+                     </property>
+                     <property name="minimum">
+                      <number>-1</number>
+                     </property>
+                     <property name="maximum">
+                      <number>9999</number>
+                     </property>
+                     <property name="value">
+                      <number>-1</number>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="10" column="0">
                     <widget class="QPushButton" name="fFadLedDrsTrgOff">
                      <property name="enabled">
@@ -8225,5 +8072,40 @@
                     </widget>
                    </item>
-                   <item row="0" column="0" colspan="2">
+                   <item row="11" column="1">
+                    <widget class="QPushButton" name="fDrsCalibReset2">
+                     <property name="text">
+                      <string>Reset</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="12" column="1">
+                    <widget class="QSpinBox" name="fDrsCalibROI2">
+                     <property name="alignment">
+                      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                     </property>
+                     <property name="readOnly">
+                      <bool>true</bool>
+                     </property>
+                     <property name="buttonSymbols">
+                      <enum>QAbstractSpinBox::NoButtons</enum>
+                     </property>
+                     <property name="specialValueText">
+                      <string>n/a</string>
+                     </property>
+                     <property name="prefix">
+                      <string/>
+                     </property>
+                     <property name="minimum">
+                      <number>-1</number>
+                     </property>
+                     <property name="maximum">
+                      <number>9999</number>
+                     </property>
+                     <property name="value">
+                      <number>-1</number>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="7" column="0" colspan="2">
                     <widget class="Line" name="line_59">
                      <property name="orientation">
@@ -8231,17 +8113,4 @@
                      </property>
                     </widget>
-                   </item>
-                   <item row="7" column="1">
-                    <spacer name="verticalSpacer_35">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
                    </item>
                   </layout>
@@ -9684,4 +9553,7 @@
                     <enum>QLayout::SetDefaultConstraint</enum>
                    </property>
+                   <property name="bottomMargin">
+                    <number>0</number>
+                   </property>
                    <item row="0" column="0">
                     <widget class="Line" name="line_36">
@@ -13084,5 +12956,216 @@
                </layout>
               </item>
-              <item row="3" column="0" colspan="2">
+             </layout>
+            </item>
+            <item row="1" column="0">
+             <layout class="QHBoxLayout" name="horizontalLayout_23">
+              <property name="topMargin">
+               <number>0</number>
+              </property>
+              <item>
+               <widget class="QGroupBox" name="groupBox_30">
+                <property name="title">
+                 <string>MAGIC Weather</string>
+                </property>
+                <layout class="QGridLayout" name="gridLayout_111">
+                 <item row="0" column="0">
+                  <widget class="QLabel" name="label_120">
+                   <property name="text">
+                    <string>Temp</string>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="2" column="0">
+                  <widget class="QLabel" name="label_119">
+                   <property name="text">
+                    <string>Hum</string>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="5" column="0">
+                  <widget class="QLabel" name="label_126">
+                   <property name="text">
+                    <string>Wind-Speed</string>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="6" column="0">
+                  <widget class="QLabel" name="label_136">
+                   <property name="text">
+                    <string>Wind-Direction</string>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="0" column="1">
+                  <widget class="QDoubleSpinBox" name="fMagicTemp">
+                   <property name="alignment">
+                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                   </property>
+                   <property name="readOnly">
+                    <bool>true</bool>
+                   </property>
+                   <property name="buttonSymbols">
+                    <enum>QAbstractSpinBox::NoButtons</enum>
+                   </property>
+                   <property name="suffix">
+                    <string>°C</string>
+                   </property>
+                   <property name="decimals">
+                    <number>1</number>
+                   </property>
+                   <property name="minimum">
+                    <double>-100.000000000000000</double>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="2" column="1">
+                  <widget class="QDoubleSpinBox" name="fMagicHum">
+                   <property name="alignment">
+                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                   </property>
+                   <property name="readOnly">
+                    <bool>true</bool>
+                   </property>
+                   <property name="buttonSymbols">
+                    <enum>QAbstractSpinBox::NoButtons</enum>
+                   </property>
+                   <property name="suffix">
+                    <string>%</string>
+                   </property>
+                   <property name="decimals">
+                    <number>1</number>
+                   </property>
+                   <property name="maximum">
+                    <double>100.000000000000000</double>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="5" column="1">
+                  <widget class="QDoubleSpinBox" name="fMagicWind">
+                   <property name="alignment">
+                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                   </property>
+                   <property name="readOnly">
+                    <bool>true</bool>
+                   </property>
+                   <property name="buttonSymbols">
+                    <enum>QAbstractSpinBox::NoButtons</enum>
+                   </property>
+                   <property name="suffix">
+                    <string> km/h</string>
+                   </property>
+                   <property name="decimals">
+                    <number>1</number>
+                   </property>
+                   <property name="maximum">
+                    <double>500.000000000000000</double>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="6" column="1">
+                  <widget class="QDoubleSpinBox" name="fMagicWindDir">
+                   <property name="alignment">
+                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                   </property>
+                   <property name="readOnly">
+                    <bool>true</bool>
+                   </property>
+                   <property name="buttonSymbols">
+                    <enum>QAbstractSpinBox::NoButtons</enum>
+                   </property>
+                   <property name="suffix">
+                    <string>°</string>
+                   </property>
+                   <property name="decimals">
+                    <number>0</number>
+                   </property>
+                   <property name="minimum">
+                    <double>-180.000000000000000</double>
+                   </property>
+                   <property name="maximum">
+                    <double>180.000000000000000</double>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="1" column="1">
+                  <widget class="QDoubleSpinBox" name="fMagicDew">
+                   <property name="alignment">
+                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                   </property>
+                   <property name="readOnly">
+                    <bool>true</bool>
+                   </property>
+                   <property name="buttonSymbols">
+                    <enum>QAbstractSpinBox::NoButtons</enum>
+                   </property>
+                   <property name="suffix">
+                    <string>°C</string>
+                   </property>
+                   <property name="decimals">
+                    <number>1</number>
+                   </property>
+                   <property name="minimum">
+                    <double>-100.000000000000000</double>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="1" column="0">
+                  <widget class="QLabel" name="label_123">
+                   <property name="text">
+                    <string>Dew</string>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="3" column="1">
+                  <widget class="QDoubleSpinBox" name="fMagicPressure">
+                   <property name="alignment">
+                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                   </property>
+                   <property name="readOnly">
+                    <bool>true</bool>
+                   </property>
+                   <property name="buttonSymbols">
+                    <enum>QAbstractSpinBox::NoButtons</enum>
+                   </property>
+                   <property name="suffix">
+                    <string> hPa</string>
+                   </property>
+                   <property name="decimals">
+                    <number>0</number>
+                   </property>
+                   <property name="maximum">
+                    <double>3000.000000000000000</double>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="3" column="0">
+                  <widget class="QLabel" name="label_146">
+                   <property name="text">
+                    <string>Pressure</string>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+              <item>
                <widget class="QGroupBox" name="groupBox_22">
                 <property name="title">
@@ -14472,4 +14555,16 @@
                <enum>QAbstractSpinBox::NoButtons</enum>
               </property>
+              <property name="currentSection">
+               <enum>QDateTimeEdit::HourSection</enum>
+              </property>
+              <property name="displayFormat">
+               <string>hh:mm:ss</string>
+              </property>
+              <property name="calendarPopup">
+               <bool>false</bool>
+              </property>
+              <property name="timeSpec">
+               <enum>Qt::OffsetFromUTC</enum>
+              </property>
               <property name="time">
                <time>
@@ -14478,16 +14573,4 @@
                 <second>0</second>
                </time>
-              </property>
-              <property name="currentSection">
-               <enum>QDateTimeEdit::HourSection</enum>
-              </property>
-              <property name="displayFormat">
-               <string>hh:mm:ss</string>
-              </property>
-              <property name="calendarPopup">
-               <bool>false</bool>
-              </property>
-              <property name="timeSpec">
-               <enum>Qt::OffsetFromUTC</enum>
               </property>
              </widget>
@@ -14614,4 +14697,16 @@
                <enum>QAbstractSpinBox::NoButtons</enum>
               </property>
+              <property name="currentSection">
+               <enum>QDateTimeEdit::HourSection</enum>
+              </property>
+              <property name="displayFormat">
+               <string>hh:mm:ss</string>
+              </property>
+              <property name="calendarPopup">
+               <bool>false</bool>
+              </property>
+              <property name="timeSpec">
+               <enum>Qt::OffsetFromUTC</enum>
+              </property>
               <property name="time">
                <time>
@@ -14620,16 +14715,4 @@
                 <second>0</second>
                </time>
-              </property>
-              <property name="currentSection">
-               <enum>QDateTimeEdit::HourSection</enum>
-              </property>
-              <property name="displayFormat">
-               <string>hh:mm:ss</string>
-              </property>
-              <property name="calendarPopup">
-               <bool>false</bool>
-              </property>
-              <property name="timeSpec">
-               <enum>Qt::OffsetFromUTC</enum>
               </property>
              </widget>
@@ -15003,4 +15086,48 @@
               </property>
              </widget>
+            </item>
+            <item row="26" column="0">
+             <widget class="QLabel" name="label_151">
+              <property name="text">
+               <string>Logger</string>
+              </property>
+             </widget>
+            </item>
+            <item row="26" column="1">
+             <layout class="QHBoxLayout" name="horizontalLayout_28">
+              <property name="topMargin">
+               <number>0</number>
+              </property>
+              <item>
+               <widget class="QPushButton" name="fLoggerStart">
+                <property name="text">
+                 <string>Start</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QPushButton" name="fLoggerStop">
+                <property name="enabled">
+                 <bool>true</bool>
+                </property>
+                <property name="text">
+                 <string>Stop</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <spacer name="horizontalSpacer_37">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
             </item>
            </layout>
@@ -15383,4 +15510,115 @@
        </layout>
       </widget>
+      <widget class="QWidget" name="tab">
+       <attribute name="title">
+        <string>Drive</string>
+       </attribute>
+       <layout class="QGridLayout" name="gridLayout_98">
+        <item row="0" column="0">
+         <widget class="QDockWidget" name="fDriveDock">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="features">
+           <set>QDockWidget::NoDockWidgetFeatures</set>
+          </property>
+          <property name="allowedAreas">
+           <set>Qt::AllDockWidgetAreas</set>
+          </property>
+          <property name="windowTitle">
+           <string>Drive controls</string>
+          </property>
+          <widget class="QWidget" name="fDriveWidget">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <layout class="QGridLayout" name="gridLayout_97" rowstretch="0,0" columnstretch="0,0">
+            <item row="0" column="1">
+             <widget class="QGroupBox" name="groupBox_27">
+              <property name="title">
+               <string>TPoint LEDs</string>
+              </property>
+              <layout class="QGridLayout" name="gridLayout_105">
+               <item row="0" column="1">
+                <widget class="QSpinBox" name="spinBox">
+                 <property name="alignment">
+                  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                 </property>
+                 <property name="specialValueText">
+                  <string>off</string>
+                 </property>
+                 <property name="maximum">
+                  <number>32767</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="1">
+                <widget class="QSpinBox" name="spinBox_2">
+                 <property name="alignment">
+                  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                 </property>
+                 <property name="specialValueText">
+                  <string>off</string>
+                 </property>
+                 <property name="maximum">
+                  <number>32767</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="0">
+                <widget class="QLabel" name="label_250">
+                 <property name="text">
+                  <string>Top</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="0">
+                <widget class="QLabel" name="label_251">
+                 <property name="text">
+                  <string>Bottom</string>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item row="0" column="0">
+             <spacer name="horizontalSpacer_63">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item row="1" column="0">
+             <spacer name="verticalSpacer_90">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>40</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </widget>
+         </widget>
+        </item>
+       </layout>
+      </widget>
       <widget class="QWidget" name="fChatTab">
        <attribute name="title">
@@ -16137,6 +16375,6 @@
      <x>0</x>
      <y>0</y>
-     <width>1381</width>
-     <height>20</height>
+     <width>1383</width>
+     <height>21</height>
     </rect>
    </property>
@@ -16173,6 +16411,6 @@
    <property name="minimumSize">
     <size>
-     <width>329</width>
-     <height>96</height>
+     <width>0</width>
+     <height>0</height>
     </size>
    </property>
@@ -16378,6 +16616,6 @@
    <property name="minimumSize">
     <size>
-     <width>221</width>
-     <height>796</height>
+     <width>0</width>
+     <height>0</height>
     </size>
    </property>
@@ -17283,35 +17521,4 @@
      </item>
      <item>
-      <widget class="QLabel" name="label_151">
-       <property name="text">
-        <string>Logger</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_28">
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="QPushButton" name="fLoggerStart">
-         <property name="text">
-          <string>Start</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="fLoggerStop">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="text">
-          <string>Stop</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
       <widget class="QLabel" name="label_155">
        <property name="text">
Index: /trunk/FACT++/src/magicweather.cc
===================================================================
--- /trunk/FACT++/src/magicweather.cc	(revision 12651)
+++ /trunk/FACT++/src/magicweather.cc	(revision 12652)
@@ -296,5 +296,5 @@
     ConnectionDimDrive(ba::io_service& ioservice, MessageImp &imp) :
         ConnectionWeather(ioservice, imp),
-        fDimWeather("MAGIC_WEATHER", "S:1;F:1;F:1;F:1;F:1;F:1;F:1",
+        fDimWeather("DATA", "S:1;F:1;F:1;F:1;F:1;F:1;F:1",
                      "|stat:Status"
                      "|T[deg C]:Temperature"
@@ -402,5 +402,5 @@
 public:
     StateMachineDrive(ostream &out=cout) :
-        T(out, "DRIVE_CONTROL"), ba::io_service::work(static_cast<ba::io_service&>(*this)),
+        T(out, "MAGIC_WEATHER"), ba::io_service::work(static_cast<ba::io_service&>(*this)),
         fWeather(*this, *this)
     {