Merge branch 'feature/MicroScenatios_contents' into develop

Author: Pawel Kazmierzewski

src/scenarios/LucidDreamScenario.cpp

@@ -34,81 +34,3 @@ LucidDreamScenario::LucidDreamScenario(const ncScenarioInitArgs *args)
     this->addTriggersToRefreshList({rem_detected_trigger});
 
   }
-
-
-// ncUpdateOutput LucidDreamScenario::update(const ncScenarioInput *updateArgs) {
-//   unsigned long long remDuration =
-//       updateArgs->scenarioSpecific.lucidDream.timestamp - m_remStartTimestamp;
-
-//   if (m_remDetected)
-//     if (remDuration >= 180000 &&
-//         !m_remCounted) { // TODO: 180000 needs to be a parameter
-//       m_remCounter++;
-//       m_remCounted = true;
-//     }
-
-//   if (updateArgs->scenarioSpecific.lucidDream.currentSleep_stage == REM) {
-//     if (!m_remDetected) {
-//       m_remStartTimestamp = updateArgs->scenarioSpecific.lucidDream.timestamp;
-//       remDuration = 0;
-//       m_remDetected = true;
-//       m_remCounted = false;
-//     } else {
-//     }
-//   } else {
-//     if (m_remDetected) {
-//       m_remDetected = false;
-//       m_remCounted = false;
-//     }
-//     m_lucidLoaded = false;
-//   }
-
-//   switch (m_remCounter) {
-//   case 0:
-//   case 1:
-//   case 2:
-//     break;
-//   case 3:
-//     if (remDuration >= 300000) { // TODO: 300000 needs to ba a parameter
-//       if (!m_lucidLoaded) {
-//         lucidDreamSequence(240000, 5, 5000, 1000,
-//                            updateArgs->scenarioSpecific.lucidDream.timestamp);
-//         m_lucidLoaded = true;
-//         return UPDATE_NEW_DATA;
-//       }
-//     }
-//     break;
-//   default:
-//     if (remDuration >= 600000) { // TODO: 600000 needs to ba a parameter
-//       if (!m_lucidLoaded) {
-//         lucidDreamSequence(240000, 5, 5000, 1000,
-//                            updateArgs->scenarioSpecific.lucidDream.timestamp);
-//         m_lucidLoaded = true;
-//         return UPDATE_NEW_DATA;
-//       }
-//     }
-//     break;
-//   }
-
-//   return UPDATE_OK;
-// }
-
-// void LucidDreamScenario::lucidDreamSequence(unsigned long length,
-//                                             unsigned long numberOfActions,
-//                                             unsigned long actionDuration,
-//                                             unsigned long actionPeriod,
-//                                             unsigned long timestamp) {
-//   ncAtomicInstruction instruction;
-//   uint8_t intensities[7];
-//   std::memset(intensities, 63, sizeof(intensities));
-//   size_t len;
-//   for (unsigned long i = 0; i < numberOfActions; ++i) {
-//     device_set_func(instruction.data, &len,
-//                     DEV_POWER_LED | DEV_RIGHT_RED_LED | DEV_LEFT_RED_LED,
-//                     FUN_TYPE_BLINK, intensities, actionDuration / 100,
-//                     actionPeriod / 100, 0);
-//     instruction.time = timestamp;
-//     pushInstruction(instruction);
-//     timestamp += numberOfActions > 1 ? length / (numberOfActions - 1) : 0;
-//   }
-// }

src/scenarios/SleepScenario.cpp

@@ -63,8 +63,9 @@ SleepScenario::SleepScenario(const ncScenarioInitArgs *args)
 
   // init and register hard wakeup
   auto hard_wakeup_scenario =
-      std::shared_ptr<HardWakeupMicroScenario>(new HardWakeupMicroScenario());
-  // [TODO] install triggers
+    std::shared_ptr<HardWakeupMicroScenario>(
+        new HardWakeupMicroScenario(ncWakeUpSequenceIntensity::WAKEUP_ALARM_MEDIUM));
+  hard_wakeup_scenario->installActivationTrigger(absolute_wake_trigger);
   this->addScenarioWithPriority(hard_wakeup_scenario, kHardWakeupPriority);
 
   // init and register smart wakeup

src/scenarios/microscenarios/HardWakeupMicroScenario.cpp

@@ -1,7 +1,35 @@
+#include "MicroScenarioSequenceLibrary.h"
 #include "HardWakeupMicroScenario.h"
 
+HardWakeupMicroScenario::HardWakeupMicroScenario(ncWakeUpSequenceIntensity intensity):
+  m_activationRegistered(false),
+  m_intensity(intensity) {}
+
 HardWakeupMicroScenario::MicroScenarioUpdate
 HardWakeupMicroScenario::update(bool did_activate, bool last_instructions) {
-  // [TODO]
-  return {};
+
+  /* tirgger fired sending sequence */
+  if(did_activate && !m_activationRegistered){
+    m_activationRegistered = true;
+    return {MicroScenarioState::WANTS_FOCUS, {
+      sequence::wakeUpSequence(static_cast<wakeUpSequenceIntensity>(m_intensity))}, {}};
+  }
+
+  /* clean sequnce */
+  if(last_instructions){
+    if(m_activationRegistered){
+      return {MicroScenarioState::WANTS_FOCUS, {sequence::killSequence()}, {}};
+    }
+    else{
+      return {MicroScenarioState::FINISHED, {}, {}};
+    }
+  }
+
+  if(m_activationRegistered && !did_activate){
+    m_activationRegistered = false;
+    return {MicroScenarioState::WANTS_FOCUS, {
+      sequence::wakeUpSequence(wakeUpSequenceIntensity::WU_ALARM_OFF)}, {}};
+  }
+
+  return {MicroScenarioState::IDLE, {}, {}};
 }

src/scenarios/microscenarios/HardWakeupMicroScenario.h

@@ -16,22 +16,38 @@
 #include "MicroScenario.h"
 #include "NeuroonApiCommons.h"
 #include "TimeTrigger.h"
+#include "NeuroonMaskScenariosApi.h"
 #include <vector>
 
+typedef enum{
+  WAKEUP_ALARM_SOFT = 0x01,
+  WAKEUP_ALARM_MEDIUM,
+  WAKEUP_ALARM_HARD,
+  WAKEUP_ALARM_OFF
+}ncWakeUpSequenceIntensity;
+
 class HardWakeupMicroScenario : public MicroScenario {
 
 private:
   const int kHardwakeupTime = 1;
   const int kWokenUp = 2;
   const int kLostSignal = 3;
 
+  bool m_activationRegistered;
+  ncWakeUpSequenceIntensity m_intensity;
+
 public:
 
+  HardWakeupMicroScenario(ncWakeUpSequenceIntensity);
   virtual ~HardWakeupMicroScenario() {}
 
   virtual MicroScenarioUpdate update(bool did_activate,
                                      bool last_instructions) override;
 
+  void installActivationTrigger(std::shared_ptr<const IScenarioTrigger> t) {
+    return this->installTriggerForKey(t, kHardwakeupTime);
+  }
+
 };
 
 #endif /* !HARDWAKEUPMICROSCENARIO_H */

src/scenarios/microscenarios/MicroScenarioSequenceLibrary.cpp

@@ -252,7 +252,7 @@ namespace sequence{
     return instructions;
   }
 
-  std::vector<ncAtomicInstruction> wakeUpSequence(ncWakeUpSequenceIntensity mode){
+  std::vector<ncAtomicInstruction> wakeUpSequence(wakeUpSequenceIntensity mode){
     switch(mode){
       case WU_ALARM_SOFT:    return getSoftAlarm();
       case WU_ALARM_MEDIUM:  return getMediumAlarm();

src/scenarios/microscenarios/MicroScenarioSequenceLibrary.h

@@ -18,15 +18,15 @@ typedef enum{
   WU_ALARM_MEDIUM,
   WU_ALARM_HARD,
   WU_ALARM_OFF
-}ncWakeUpSequenceIntensity;
+}wakeUpSequenceIntensity;
 
 namespace sequence{
 
   std::vector<ncAtomicInstruction> descendSequence(unsigned int);
   std::vector<ncAtomicInstruction> parametrizedSinusLikeSequence(unsigned int, unsigned int,
       unsigned int, unsigned int, unsigned int);
   std::vector<ncAtomicInstruction> artificialDawnSequence(unsigned int);
-  std::vector<ncAtomicInstruction> wakeUpSequence(ncWakeUpSequenceIntensity);
+  std::vector<ncAtomicInstruction> wakeUpSequence(wakeUpSequenceIntensity);
   std::vector<ncAtomicInstruction> lucidDreamSequence();
   std::vector<ncAtomicInstruction> circadianShiftSequence();
   std::vector<ncAtomicInstruction> noContactSequence();

src/scenarios/microscenarios/SmartWakeupMicroScenario.cpp

@@ -1,4 +1,5 @@
 #include "SmartWakeupMicroScenario.h"
+#include "MicroScenarioSequenceLibrary.h"
 
 SmartWakeupMicroScenario::MicroScenarioUpdate
 SmartWakeupMicroScenario::update(bool did_activate, bool last_instructions) {