feat(cmat): pass hints to Ex42 observers

Extend the Ex42 observer pattern with Hint objects so each observer receives the reason for the update instead of querying the subject: - Subject::notify() and Observer::update() now take a const Hint& argument. - Add LightHint and WaitHint carrying the traffic light state and WAIT button state, defined in Pelican.h. - Pole dispatches on hint type using dynamic_cast. - The Pole constructor sets its initial lights directly from the Pelican's current state, since no notification is sent at startup. Stopgap until the initial update is handled properly. Co-authored-by: Qwen 3.8 27B <qwen3.8_27b-q3_k_xl@lmstudio.local>
2026-10-07 11:31:16 +02:00
parent 11b96e4410
commit a65e84e796
7 changed files with 277 additions and 244 deletions
@@ -1,55 +1,57 @@
-
-
-#include "Pelican.h"
-#include "PelicanTimer.h"
-
-Pelican::Pelican() : pressed(false), RED_TIME(4), YELLOW_TIME(2), GREEN_TIME(3), FLASH_TIME(5), state(GREEN_IDLE) {
-    myTimer = new PelicanTimer(*this, &Pelican::timerExpired);
-}
-
-void Pelican::press(void) {
-    if (state == GREEN_IDLE) {
-        state = YELLOW_STATE;
-        myTimer->timeoutRequest(YELLOW_TIME);
-        pressed = true;
-        notify();
-    } else if (state != RED_STATE) {
-        pressed = true;
-        notify();
-    }
-}
-
-void Pelican::timerExpired(void) {
-    switch (state) {
-    case RED_STATE:
-        state = YELLOW_FLASHING;
-        myTimer->timeoutRequest(FLASH_TIME);
-        break;
-
-    case YELLOW_FLASHING:
-        state = GREEN_TIMING;
-        myTimer->timeoutRequest(GREEN_TIME);
-        break;
-
-    case GREEN_TIMING:
-        if (pressed) {
-            state = YELLOW_STATE;
-            myTimer->timeoutRequest(YELLOW_TIME);
-        } else {
-            state = GREEN_IDLE;
-        }
-        break;
-
-    case GREEN_IDLE:
-        //    should never happen
-        break;
-
-    case YELLOW_STATE:
-        state = RED_STATE;
-        pressed = false;
-        myTimer->timeoutRequest(RED_TIME);
-        break;
-    }
-
-    notify();
-}
+
+
+#include "Pelican.h"
+#include "PelicanTimer.h"
+#include "Subject.h"
+
+Pelican::Pelican() : pressed(false), RED_TIME(4), YELLOW_TIME(2), GREEN_TIME(3), FLASH_TIME(5), state(GREEN_IDLE) {
+    myTimer = new PelicanTimer(*this, &Pelican::timerExpired);
+}
+
+void Pelican::press(void) {
+    if (state == GREEN_IDLE) {
+        state = YELLOW_STATE;
+        myTimer->timeoutRequest(YELLOW_TIME);
+        pressed = true;
+    } else if (state != RED_STATE) {
+        pressed = true;
+    }
+    notify(LightHint(state));
+    notify(WaitHint(pressed));
+}
+
+void Pelican::timerExpired(void) {
+    switch (state) {
+    case RED_STATE:
+        state = YELLOW_FLASHING;
+        myTimer->timeoutRequest(FLASH_TIME);
+        break;
+
+    case YELLOW_FLASHING:
+        state = GREEN_TIMING;
+        myTimer->timeoutRequest(GREEN_TIME);
+        break;
+
+    case GREEN_TIMING:
+        if (pressed) {
+            state = YELLOW_STATE;
+            myTimer->timeoutRequest(YELLOW_TIME);
+        } else {
+            state = GREEN_IDLE;
+        }
+        break;
+
+    case GREEN_IDLE:
+        //    should never happen
+        break;
+
+    case YELLOW_STATE:
+        state = RED_STATE;
+        pressed = false;
+        myTimer->timeoutRequest(RED_TIME);
+        break;
+    }
+
+    notify(LightHint(state));
+    notify(WaitHint(pressed));
+}