mission/payload/RadiationSensorHandler.cpp

@@ -15,6 +15,8 @@ RadiationSensorHandler::RadiationSensorHandler(object_id_t objectId, object_id_t
   if (comCookie == nullptr) {
     sif::error << "RadiationSensorHandler: Invalid com cookie" << std::endl;
   }
+  // Time out immediately so we get an immediate measurement at device startup.
+  measurementCd.timeOut();
 }
 
 RadiationSensorHandler::~RadiationSensorHandler() {}
@@ -160,6 +162,7 @@ ReturnValue_t RadiationSensorHandler::scanForReply(const uint8_t *start, size_t
                      << std::endl;
 #endif
       }
+      measurementCd.resetTimer();
       break;
     }
     case radSens::ENABLE_DEBUG_OUTPUT: