Changeset 152 for uKadecot/trunk/kadecot/wamp_broker.h

Timestamp:

Jan 14, 2016, 1:17:21 PM (7 years ago)

Author:

coas-nagasima

Message:

・デジタルPinとアナログPinのWAMPトピックを追加し、PubSubできるように機能追加。

デジタルPINのトピックは、

「com.sonycsl.kadecot.arduino.topic.pinXX」（XXは0から13）

アナログPINのトピックは、

「com.sonycsl.kadecot.arduino.topic.pinXX.thrYYY」（XXは14から19、YYYは閾値十進）

・デバッグ用の使用していない文字列が、ROM領域に残ってしまうのを修正
・WebSocket接続時のHTTPヘッダーを１行ずつNAK応答を待って送信しているのを、一括で送るよう変更

File:

• uKadecot/trunk/kadecot/wamp_broker.h (modified) (5 diffs)

uKadecot/trunk/kadecot/wamp_broker.h

@@ -39 +39 @@
 #define WAMP_BROKER_H
 
+typedef enum wamp_subscription_kind
+{
+        WAMP_SUBSCRIPTION_KIND_NONE,
+        WAMP_SUBSCRIPTION_KIND_ECHONETLITE,
+        WAMP_SUBSCRIPTION_KIND_ARDUINO,
+} wamp_subscription_kind_t;
+
+typedef struct wamp_echonetlite_subscription
+{
+        char deviceName[40];
+        char *proprtyName;
+        uint16_t devType;
+        uint8_t epc;
+} wamp_echonetlite_subscription_t;
+
+typedef struct wamp_arduino_subscription
+{
+        uint8_t pinno;
+        uint16_t threshold;
+} wamp_arduino_subscription_t;
+
 typedef struct wamp_subscription
 {
@@ -44 +65 @@
         unsigned int requestId;
         int subscriptionId;
-        char deviceName[40];
-        char *proprtyName;
-        uint16_t devType;
-        uint8_t epc;
+        wamp_subscription_kind_t kind;
+        union{
+                wamp_echonetlite_subscription_t echonetlite;
+                wamp_arduino_subscription_t arduino;
+        };
 } wamp_subscription_t;
 
@@ -55 +77 @@
         unsigned int requestId;
         int subscriptionId;
-        wamp_subscription_t subscriptions[10];
+        wamp_subscription_t subscriptions[30];
         wamp_subscription_t *current_subscription;
         const char *error;
@@ -66 +88 @@
 void wamp_broker_subscribe_options(wamp_broker_t *broker);
 void wamp_broker_subscribe_topic(wamp_broker_t *broker, const char *value);
+void wamp_broker_subscribe_echonetlite_topic(wamp_broker_t *broker, const char *value, int pos);
+void wamp_broker_subscribe_arduino_topic(wamp_broker_t *broker, const char *value, int pos);
 void wamp_broker_subscribe_close(struct wamp_state *s);
 
@@ -89 +113 @@
 void wamp_broker_publish_inf(wamp_broker_t *broker, uint16_t pubId, int deviceId,
         uint16_t devType, uint8_t epc, uint8_t pdc, uint8_t *p_edt);
+void wamp_broker_publish_pin(wamp_broker_t *broker, uint16_t pubId, int deviceId,
+        int pinno, uint16_t value);
 
 #endif // WAMP_BROKER_H