optimize parameter properties and default values of mqtt

examples/mqtt/mqtt_publish.py

@@ -13,9 +13,9 @@ client.setKeepAlive(10)
 ret = client.connect()
 print("connect ret:%d" % ret)
 
-client.publish('topic_pikapy',0, 'hello pikascript qos=0')
-client.publish('topic_pikapy',1, 'hello pikascript qos=1')
-client.publish('topic_pikapy',2, 'hello pikascript qos=2')
+client.publish('topic_pikapy', 'hello pikascript qos=0', 0)
+client.publish('topic_pikapy', 'hello pikascript qos=1', 1)
+client.publish('topic_pikapy', 'hello pikascript qos=2', 2)
 
 ret = client.disconnect()
-print("disconnect ret:%d" % ret)
+print("disconnect ret:%d" % ret)

examples/mqtt/mqtt_subscribe.py

@@ -1,42 +1,46 @@
 import mqtt
 import PikaStdDevice
 
-client = mqtt.MQTT('broker.emqx.io',port=1883,clinetID='clientid',username='name_',password='passwd_')
+client = mqtt.MQTT('broker.emqx.io', port=1883, clinetID='clientid', username='name_', password='passwd_')
 
 ret = client.connect()
 print("connect ret:%d" % ret)
 
+
 def callback0(signal):
     recv_msg = client.getMsg(signal)
     recv_topic = client.getTopic(signal)
     recv_qos = client.getQos(signal)
-    print("py0 cb: %s-qos:%d-->>%s" % (recv_topic,recv_qos, recv_msg))
+    print("py0 cb: %s-qos:%d-->>%s" % (recv_topic, recv_qos, recv_msg))
+
 
 def callback1(signal):
     recv_msg = client.getMsg(signal)
     recv_topic = client.getTopic(signal)
     recv_qos = client.getQos(signal)
-    print("py1 cb: %s-qos:%d-->>%s" % (recv_topic,recv_qos, recv_msg))
+    print("py1 cb: %s-qos:%d-->>%s" % (recv_topic, recv_qos, recv_msg))
+
 
 def callback2(signal):
     recv_msg = client.getMsg(signal)
     recv_topic = client.getTopic(signal)
     recv_qos = client.getQos(signal)
-    print("py2 cb: %s-qos:%d-->>%s" % (recv_topic,recv_qos, recv_msg))
+    print("py2 cb: %s-qos:%d-->>%s" % (recv_topic, recv_qos, recv_msg))
 
-ret = client.subscribe('topic_pikapy_qos0', 0,callback0)
+
+ret = client.subscribe('topic_pikapy_qos0', callback0, 0)
 print("subscribe ret:%d" % ret)
-ret = client.subscribe('topic_pikapy_qos1', 1,callback1)
+ret = client.subscribe('topic_pikapy_qos1', callback1, 1)
 print("subscribe ret:%d" % ret)
-ret = client.subscribe('topic_pikapy_qos2', 2,callback2)
+ret = client.subscribe('topic_pikapy_qos2', callback2, 2)
 print("subscribe ret:%d" % ret)
 
-#sleep wait for recv data
+# sleep wait for recv data
 T = PikaStdDevice.Time()
 T.sleep_s(5)
-    
+
 out = client.listSubscribeTopic()
-print('listSubscribeTopic out',out)
+print('listSubscribeTopic out', out)
 
 # client.unsubscribe('topic_pikapy_qos0');
 # client.unsubscribe('topic_pikapy_qos1');
@@ -50,4 +54,4 @@ print('listSubscribeTopic out',out)
 T.sleep_s(10)
 # exit()
 ret = client.disconnect()
-print("disconnect ret:%d" % ret)
+print("disconnect ret:%d" % ret)

package/mqtt/_mqtt.pyi

@@ -42,7 +42,7 @@ class _MQTT:
         pass
         """disconnect to the mqtt-server."""
 
-    def subscribe(self, topic: str, qos: int, cb: any) -> int:
+    def subscribe(self, topic: str, cb: any, qos: int) -> int:
         pass
         """subscribe to the mqtt-server."""
 
@@ -54,7 +54,7 @@ class _MQTT:
         pass
         """listSubscribeTopic """
 
-    def publish(self,topic: str, qos:int, , payload: str) -> int:
+    def publish(self,topic: str, payload: str, qos:int) -> int:
         pass
         """publish to the mqtt-server."""
 

package/mqtt/_mqtt__MQTT.c

@@ -202,7 +202,7 @@ PikaObj* _mqtt__MQTT_listSubscribeTopic(PikaObj* self) {
 // 输入参数：主题名称，有效数据
 // 返 回 值：0=成功；非0=错误码
 ///////////////////////////////////////////////////////////////////
-int _mqtt__MQTT_publish(PikaObj* self, char* topic, int qos, char* payload) {
+int _mqtt__MQTT_publish(PikaObj *self, char* topic, char* payload, int qos) {
     int ret;
     mqtt_message_t msg;
 
@@ -503,7 +503,7 @@ int _mqtt__MQTT_setWill(PikaObj* self,
 // 输入参数：
 // 返 回 值：0=成功；非0=错误码
 ///////////////////////////////////////////////////////////////////
-int _mqtt__MQTT_subscribe(PikaObj* self, char* topic, int qos, Arg* cb) {
+int _mqtt__MQTT_subscribe(PikaObj *self, char* topic, Arg* cb, int qos) {
     mqtt_client_t* _client = obj_getPtr(self, "_client");
     int ret;
     char topic_str[MQTT_TOPIC_LEN_MAX + 24];

package/mqtt/mqtt.py

@@ -14,14 +14,15 @@ class MQTT(_mqtt._MQTT):
         super().__init__(ip, port, clinetID,
                          username, password, version,
                          ca, keepalive)
-    def subscribe(self,topic='',qos=0,cb=''):
-        return super().subscribe(topic,qos,cb)
 
-    def publish(self,topic='',qos=0,payload=''):
-        return super().publish(topic,qos,payload)
+    def subscribe(self, topic, cb, qos=0):
+        return super().subscribe(topic, cb, qos)
 
-    def setWill(self,topic='',payload='',qos=1,retain):
-        return super().setWill(topic,payload,qos,retain)
+    def publish(self, topic, payload, qos=0):
+        return super().publish(topic, payload, qos)
 
-    def unsubscribe(self,topic=''):
+    def setWill(self, topic, payload, qos=0, retain=0):
+        return super().setWill(topic, payload, qos, retain)
+
+    def unsubscribe(self, topic=''):
         return super().unsubscribe(topic)

port/linux/package/pikascript/_mqtt.pyi

@@ -42,7 +42,7 @@ class _MQTT:
         pass
         """disconnect to the mqtt-server."""
 
-    def subscribe(self, topic: str, qos: int, cb: any) -> int:
+    def subscribe(self, topic: str, cb: any, qos: int) -> int:
         pass
         """subscribe to the mqtt-server."""
 
@@ -54,7 +54,7 @@ class _MQTT:
         pass
         """listSubscribeTopic """
 
-    def publish(self,topic: str, qos:int, , payload: str) -> int:
+    def publish(self,topic: str, payload: str, qos:int) -> int:
         pass
         """publish to the mqtt-server."""
 

port/linux/package/pikascript/mqtt.py

@@ -14,14 +14,15 @@ class MQTT(_mqtt._MQTT):
         super().__init__(ip, port, clinetID,
                          username, password, version,
                          ca, keepalive)
-    def subscribe(self,topic='',qos=0,cb=''):
-        return super().subscribe(topic,qos,cb)
 
-    def publish(self,topic='',qos=0,payload=''):
-        return super().publish(topic,qos,payload)
+    def subscribe(self, topic, cb, qos=0):
+        return super().subscribe(topic, cb, qos)
 
-    def setWill(self,topic='',payload='',qos=1,retain):
-        return super().setWill(topic,payload,qos,retain)
+    def publish(self, topic, payload, qos=0):
+        return super().publish(topic, payload, qos)
 
-    def unsubscribe(self,topic=''):
+    def setWill(self, topic, payload, qos=0, retain=0):
+        return super().setWill(topic, payload, qos, retain)
+
+    def unsubscribe(self, topic=''):
         return super().unsubscribe(topic)

port/linux/package/pikascript/pikascript-lib/mqtt/_mqtt__MQTT.c

@@ -202,7 +202,7 @@ PikaObj* _mqtt__MQTT_listSubscribeTopic(PikaObj* self) {
 // 输入参数：主题名称，有效数据
 // 返 回 值：0=成功；非0=错误码
 ///////////////////////////////////////////////////////////////////
-int _mqtt__MQTT_publish(PikaObj* self, char* topic, int qos, char* payload) {
+int _mqtt__MQTT_publish(PikaObj *self, char* topic, char* payload, int qos) {
     int ret;
     mqtt_message_t msg;
 
@@ -503,7 +503,7 @@ int _mqtt__MQTT_setWill(PikaObj* self,
 // 输入参数：
 // 返 回 值：0=成功；非0=错误码
 ///////////////////////////////////////////////////////////////////
-int _mqtt__MQTT_subscribe(PikaObj* self, char* topic, int qos, Arg* cb) {
+int _mqtt__MQTT_subscribe(PikaObj *self, char* topic, Arg* cb, int qos) {
     mqtt_client_t* _client = obj_getPtr(self, "_client");
     int ret;
     char topic_str[MQTT_TOPIC_LEN_MAX + 24];

test/python/mqtt/mqtt_publish.py

@@ -13,9 +13,9 @@ client.setKeepAlive(10)
 ret = client.connect()
 print("connect ret:%d" % ret)
 
-client.publish('topic_pikapy',0, 'hello pikascript qos=0')
-client.publish('topic_pikapy',1, 'hello pikascript qos=1')
-client.publish('topic_pikapy',2, 'hello pikascript qos=2')
+client.publish('topic_pikapy', 'hello pikascript qos=0', 0)
+client.publish('topic_pikapy', 'hello pikascript qos=1', 1)
+client.publish('topic_pikapy', 'hello pikascript qos=2', 2)
 
 ret = client.disconnect()
-print("disconnect ret:%d" % ret)
+print("disconnect ret:%d" % ret)

test/python/mqtt/mqtt_subscribe.py

@@ -1,42 +1,46 @@
 import mqtt
 import PikaStdDevice
 
-client = mqtt.MQTT('broker.emqx.io',port=1883,clinetID='clientid',username='name_',password='passwd_')
+client = mqtt.MQTT('broker.emqx.io', port=1883, clinetID='clientid', username='name_', password='passwd_')
 
 ret = client.connect()
 print("connect ret:%d" % ret)
 
+
 def callback0(signal):
     recv_msg = client.getMsg(signal)
     recv_topic = client.getTopic(signal)
     recv_qos = client.getQos(signal)
-    print("py0 cb: %s-qos:%d-->>%s" % (recv_topic,recv_qos, recv_msg))
+    print("py0 cb: %s-qos:%d-->>%s" % (recv_topic, recv_qos, recv_msg))
+
 
 def callback1(signal):
     recv_msg = client.getMsg(signal)
     recv_topic = client.getTopic(signal)
     recv_qos = client.getQos(signal)
-    print("py1 cb: %s-qos:%d-->>%s" % (recv_topic,recv_qos, recv_msg))
+    print("py1 cb: %s-qos:%d-->>%s" % (recv_topic, recv_qos, recv_msg))
+
 
 def callback2(signal):
     recv_msg = client.getMsg(signal)
     recv_topic = client.getTopic(signal)
     recv_qos = client.getQos(signal)
-    print("py2 cb: %s-qos:%d-->>%s" % (recv_topic,recv_qos, recv_msg))
+    print("py2 cb: %s-qos:%d-->>%s" % (recv_topic, recv_qos, recv_msg))
 
-ret = client.subscribe('topic_pikapy_qos0', 0,callback0)
+
+ret = client.subscribe('topic_pikapy_qos0', callback0, 0)
 print("subscribe ret:%d" % ret)
-ret = client.subscribe('topic_pikapy_qos1', 1,callback1)
+ret = client.subscribe('topic_pikapy_qos1', callback1, 1)
 print("subscribe ret:%d" % ret)
-ret = client.subscribe('topic_pikapy_qos2', 2,callback2)
+ret = client.subscribe('topic_pikapy_qos2', callback2, 2)
 print("subscribe ret:%d" % ret)
 
-#sleep wait for recv data
+# sleep wait for recv data
 T = PikaStdDevice.Time()
 T.sleep_s(5)
-    
+
 out = client.listSubscribeTopic()
-print('listSubscribeTopic out',out)
+print('listSubscribeTopic out', out)
 
 # client.unsubscribe('topic_pikapy_qos0');
 # client.unsubscribe('topic_pikapy_qos1');
@@ -50,4 +54,4 @@ print('listSubscribeTopic out',out)
 T.sleep_s(10)
 # exit()
 ret = client.disconnect()
-print("disconnect ret:%d" % ret)
+print("disconnect ret:%d" % ret)