Shock application (PiShock & OpenShock)

generate_macro_atlas.py

@@ -107,7 +107,7 @@
 ]
 
 TILE_LABELS_P2 = [
-    ["DBG", "TWTCH", "INTRP", "-----", "DM"],
+    ["DBG", "TWTCH", "INTRP", "SHOCK", "DM"],
     ["-----", "-----", "-----", "-----", "-----"],
     ["-----", "-----", "-----", "-----", "-----"],
 ]
@@ -806,6 +806,38 @@ def layout_dm_compose(buf):
     buf.put_status_bar()
 
 
+def layout_shock(buf):
+    """Shock control screen: frame + labels + Execute button."""
+    buf.put_frame("SHOCK")
+
+    # Row 1 (ty=0): Shocker Selection
+    buf.put_text(3, 1, " < ", inverted=True) # tx=0
+    buf.put_text(34, 1, " > ", inverted=True) # tx=4
+
+    # Row 2: Separator
+    buf.put_hline(2)
+
+    # Row 3: Status
+    buf.put_text(4, 3, "ACTIVE MODE:")
+
+    # Row 4 (ty=1): Intensity & Duration on same line
+    # tx=0: Int -, tx=2: Int +, tx=3: Dur -, tx=4: Dur +
+    buf.put_text(2, 4, " - ", inverted=True)  # tx=0
+    buf.put_text(16, 4, " + ", inverted=True) # tx=2
+    buf.put_text(24, 4, " - ", inverted=True) # tx=3
+    buf.put_text(34, 4, " + ", inverted=True) # tx=4
+
+    # Row 5 : Separator
+    buf.put_hline(5)
+
+    # Row 6 (ty=2): Mode & Execute
+    # tx=0-1: MODE button (11 chars), tx=3-4: EXECUTE button (11 chars)
+    buf.put_text(2, 6, " [  MODE   ] ", inverted=True) # tx=0-1
+    buf.put_text(25, 6, " [ EXECUTE ] ", inverted=True) # tx=3-4
+
+    buf.put_status_bar()
+
+
 def layout_dm_pair(buf):
     """DM Pair CHOOSE mode: frame + DIAL/SCAN buttons + hint text."""
     buf.put_frame("DM PAIR")
@@ -909,6 +941,7 @@ def layout_dm_pair_joined(buf):
     45: ("PAIR OK", layout_dm_pair_complete),
     46: ("PAIR FAIL", layout_dm_pair_failed),
     47: ("PAIR JOIN", layout_dm_pair_joined),
+    48: ("SHOCK", layout_shock),
 }
 
 

yip_os/CMakeLists.txt

@@ -148,7 +148,11 @@ set(YIPOS_SOURCES
     src/screens/DMPairScreen.cpp
     src/screens/DMComposeScreen.cpp
     src/screens/DMMessageScreen.cpp
+    src/screens/ShockScreen.cpp
     src/net/DMClient.cpp
+    src/net/OpenShockClient.cpp
+    src/net/PiShockClient.cpp
+    src/net/ShockManager.cpp
     src/img/QRGen.cpp
     src/translate/TranslationWorker.cpp
     src/img/VQEncoder.cpp
@@ -164,6 +168,7 @@ set(YIPOS_SOURCES
     src/ui/UIManager_Data.cpp
     src/ui/UIManager_Config.cpp
     src/ui/UIManager_DM.cpp
+    src/ui/UIManager_Shock.cpp
 )
 
 # Platform-specific sources

yip_os/src/app/PDAController.cpp

@@ -12,6 +12,7 @@
 #include "net/TwitchClient.hpp"
 #include "media/MediaController.hpp"
 #include "platform/SystemStats.hpp"
+#include "net/ShockManager.hpp"
 #include "core/Glyphs.hpp"
 #include "core/Config.hpp"
 #include "core/Logger.hpp"
@@ -97,6 +98,10 @@ PDAController::PDAController(PDADisplay& display, NetTracker& net_tracker, Confi
         }
     }
 
+    // Initialize shock manager
+    shock_manager_ = std::make_unique<ShockManager>();
+    shock_manager_->InitFromConfig(config_);
+
     // Push home screen as root
     auto home = std::make_unique<HomeScreen>(*this);
     screen_stack_.push_back(std::move(home));
@@ -819,4 +824,4 @@ void PDAController::RefreshStockCache() {
     stock_client_->FetchAll(window);
 }
 
-} // namespace YipOS
+} // namespace YipOS

yip_os/src/app/PDAController.hpp

@@ -34,6 +34,7 @@ class StockClient;
 class TwitchClient;
 struct TwitchMessage;
 class TranslationWorker;
+class ShockManager;
 
 class PDAController {
 public:
@@ -141,6 +142,9 @@ class PDAController {
     void RefreshChatCache();
     void MarkChatSeen();
 
+    // OpenShock & PiShock integration
+    ShockManager* GetShockManager() { return shock_manager_.get(); }
+
     // Hard lock (full LOCK screen from home tile)
     void SetLocked(bool locked);
     bool IsLocked() const { return locked_; }
@@ -231,6 +235,7 @@ class PDAController {
     std::unique_ptr<StockClient> stock_client_;
     std::unique_ptr<TwitchClient> twitch_client_;
     const TwitchMessage* selected_twitch_ = nullptr;
+    std::unique_ptr<ShockManager> shock_manager_;
     std::string assets_path_;
     std::unique_ptr<AudioPlayer> dm_notify_sound_;
     bool prev_has_unseen_dm_ = false;
@@ -292,4 +297,4 @@ class PDAController {
     std::array<std::atomic<int>, SPVR_DEVICE_COUNT> spvr_status_{};
 };
 
-} // namespace YipOS
+} // namespace YipOS

yip_os/src/core/Glyphs.hpp

@@ -32,7 +32,7 @@ constexpr TileLabel TILE_LABELS[HOME_PAGES][TILE_ROWS][TILE_COLS] = {
      {{"VRCX"},  {"HEART"}, {"BFI"},   {"STONK"}, {"CHAT"}},
      {{"CC"},    {"AVTR"},  {"TEXT"},  {"MEDIA"}, {"LOCK"}}},
     // Page 1
-    {{{"DBG"},   {"TWTCH"}, {"INTRP"}, {"-----"}, {"DM"}},
+    {{{"DBG"},   {"TWTCH"}, {"INTRP"}, {"SHOCK"}, {"DM"}},
      {{"-----"}, {"-----"}, {"-----"}, {"-----"}, {"-----"}},
      {{"-----"}, {"-----"}, {"-----"}, {"-----"}, {"-----"}}},
 };

yip_os/src/net/IShockClient.hpp

@@ -0,0 +1,45 @@
+/**
+ * IShockClient.hpp
+ * V1.0.0
+ *
+ * Interface for Shock API integration to YipOS for remote control of
+ * OpenShock and PiShock devices.
+ *
+ * By otter_oasis
+ */
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+namespace YipOS {
+
+struct Shocker {
+  std::string id;
+  std::string name;
+  bool is_owned = false;
+  std::string backend; // "openshock" or "pishock"
+};
+
+class IShockClient {
+public:
+  virtual ~IShockClient() = default;
+
+  virtual void SetEnabled(bool enabled) = 0;
+  virtual bool HasConfig() const = 0;
+  virtual bool IsTokenValid() const = 0;
+  virtual bool IsEnabled() const = 0;
+
+  virtual bool FetchShockers() = 0;
+  virtual const std::vector<Shocker> &GetShockers() const = 0;
+
+  virtual bool SendControl(const std::string &shocker_id,
+                           const std::string &type, float intensity,
+                           int duration_ms) = 0;
+
+  virtual int GetMinDurationMs() const = 0;
+  virtual int GetMaxDurationMs() const = 0;
+};
+
+} // namespace YipOS