Index: denali.pro =================================================================== diff -u -re226d05ea339805934c2ebbaba108e7b03d5a001 -r3bae841a29b562bac9a4a57ac9965505b15d1327 --- denali.pro (.../denali.pro) (revision e226d05ea339805934c2ebbaba108e7b03d5a001) +++ denali.pro (.../denali.pro) (revision 3bae841a29b562bac9a4a57ac9965505b15d1327) @@ -53,8 +53,6 @@ sources/main.h \ sources/model/MDGDebugText.h \ sources/model/MHDDebugText.h \ - sources/model/dg/data/MDGAccelerometerData.h \ - sources/model/hd/data/MHDAccelerometerData.h \ sources/storage/DriveWatcher.h \ sources/threads.h \ sources/maintimer.h \ @@ -86,6 +84,7 @@ sources/model/hd/data/MTreatmentStatesData.h \ sources/model/hd/data/MHDOperationModeData.h \ sources/model/hd/data/MTreatmentSalineData.h \ + sources/model/hd/data/MHDAccelerometerData.h \ \ # ---------- Models - DG - Data sources/model/dg/data/MDGDrainPumpData.h \ sources/model/dg/data/MDGHeatersData.h \ @@ -96,6 +95,7 @@ sources/model/dg/data/MDGROPumpData.h \ sources/model/dg/data/MDGTemperaturesData.h \ sources/model/dg/data/MDGValvesStatesData.h \ + sources/model/dg/data/MDGAccelerometerData.h \ \ # CANBus sources/canbus/caninterface.h \ sources/canbus/frameinterface.h \ @@ -111,8 +111,6 @@ sources/gui/guicontroller.h \ \ # ---------- Views ---------- sources/view/VEventSpy.h \ - sources/view/dg/data/VDGAccelerometerData.h \ - sources/view/hd/data/VHDAccelerometerData.h \ sources/view/hd/data/VHDTreatmentStatesData.h \ sources/view/vview.h \ sources/view/vpoweroff.h \ @@ -135,6 +133,7 @@ sources/view/vtreatmentpressureocclusion.h \ sources/view/hd/data/VHDOperationModeData.h \ sources/view/hd/data/VTreatmentSalineData.h \ + sources/view/hd/data/VHDAccelerometerData.h \ \ # ---------- Views - DG - Data sources/view/dg/data/VDGDrainPumpData.h \ sources/view/dg/data/VDGHeatersData.h \ @@ -145,6 +144,7 @@ sources/view/dg/data/VDGReservoirData.h \ sources/view/dg/data/VDGTemperaturesData.h \ sources/view/dg/data/VDGValvesStatesData.h \ + sources/view/dg/data/VDGAccelerometerData.h \ \ # Storage sources/storage/storageglobals.h \ sources/storage/filehandler.h \ @@ -163,8 +163,6 @@ main.cpp \ sources/model/MDGDebugText.cpp \ sources/model/MHDDebugText.cpp \ - sources/model/dg/data/MDGAccelerometerData.cpp \ - sources/model/hd/data/MHDAccelerometerData.cpp \ sources/storage/DriveWatcher.cpp \ sources/threads.cpp \ sources/maintimer.cpp \ @@ -194,6 +192,7 @@ sources/model/hd/data/MTreatmentStatesData.cpp \ sources/model/hd/data/MHDOperationModeData.cpp \ sources/model/hd/data/MTreatmentSalineData.cpp \ + sources/model/hd/data/MHDAccelerometerData.cpp \ \ # ---------- Models - DG - Data sources/model/dg/data/MDGDrainPumpData.cpp \ sources/model/dg/data/MDGHeatersData.cpp \ @@ -204,6 +203,7 @@ sources/model/dg/data/MDGROPumpData.cpp \ sources/model/dg/data/MDGTemperaturesData.cpp \ sources/model/dg/data/MDGValvesStatesData.cpp \ + sources/model/dg/data/MDGAccelerometerData.cpp \ \ # CANBus sources/canbus/caninterface.cpp \ sources/canbus/frameinterface.cpp \ @@ -218,8 +218,6 @@ sources/gui/guicontroller.cpp \ \ # ---------- Views ---------- sources/view/VEventSpy.cpp \ - sources/view/dg/data/VDGAccelerometerData.cpp \ - sources/view/hd/data/VHDAccelerometerData.cpp \ sources/view/hd/data/VHDTreatmentStatesData.cpp \ sources/view/vpoweroff.cpp \ \ # ---------- Views - Alarm @@ -241,6 +239,7 @@ sources/view/vtreatmentpressureocclusion.cpp \ sources/view/hd/data/VHDOperationModeData.cpp \ sources/view/hd/data/VTreatmentSalineData.cpp \ + sources/view/hd/data/VHDAccelerometerData.cpp \ \ # ---------- Views - DG - Data sources/view/dg/data/VDGDrainPumpData.cpp \ sources/view/dg/data/VDGHeatersData.cpp \ @@ -251,6 +250,7 @@ sources/view/dg/data/VDGReservoirData.cpp \ sources/view/dg/data/VDGTemperaturesData.cpp \ sources/view/dg/data/VDGValvesStatesData.cpp \ + sources/view/dg/data/VDGAccelerometerData.cpp \ \ # Storage sources/storage/storageglobals.cpp \ sources/storage/filehandler.cpp \