Skip to content

Commit ec63309

Browse files
Kacp3r3Kacp3r3
committed
readme update, directory cleanup
1 parent 02b0542 commit ec63309

15 files changed

+69
-342
lines changed

‎1_send_data.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
import sys
33
import time
44

5-
from LiveObjectsSDK.Connection import *
5+
import LiveObjects
66

7-
#Create LiveObjects with parameters: ClientID - Port - APIKEY
8-
lo = LiveObjects("PythonMQTT", 1883, "<APIKEY>")
7+
#Create LiveObjects with parameters: ClientID - Security - APIKEY
8+
lo = LiveObjects.Connection("PythonMQTT", LiveObjects.NONE, "<APIKEY>")
99

1010
messageRate = 5
1111

‎2_simple_parameters.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
import sys
33
import time
44

5-
from LiveObjectsSDK.Connection import *
5+
import LiveObjects
66

7-
#Create LiveObjects with parameters: ClientID - Port - APIKEY
8-
lo = LiveObjects("PythonMQTT", 1883, "<APIKEY>")
7+
#Create LiveObjects with parameters: ClientID - Security - APIKEY
8+
lo = LiveObjects.Connection("PythonMQTT", LiveObjects.NONE, "<APIKEY>")
99

1010
#Main program
11-
lo.addParameter("messageRate", 5 , INT) #Add parameter: Name - Value - Type
11+
lo.addParameter("messageRate", 5 , LiveObjects.INT) #Add parameter: Name - Value - Type
1212
#Available types: INT BINARY STRING FLOAT
1313
lo.connect() #Connect to LiveObjects
1414
last = time.time()

‎3_parameter_with_callback.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
import sys
33
import time
44

5-
from LiveObjectsSDK.Connection import *
5+
import LiveObjects
66

77

8-
#Create LiveObjects with parameters: ClientID - Port - APIKEY
9-
lo = LiveObjects("PythonMQTT", 1883, "<APIKEY>")
8+
#Create LiveObjects with parameters: ClientID - Security - APIKEY
9+
lo = LiveObjects.Connection("PythonMQTT", LiveObjects.NONE, "<APIKEY>")
1010

1111
#Callback for a parameter change
1212
def callback(parameterName, newValue):
1313
print("Changed value of the parameter "+parameterName+" to " + str(newValue))
1414

1515

1616
#Main program
17-
lo.addParameter("messageRate", 5 , INT, callback) #Add parameter: Name - Value - Type - Callback
17+
lo.addParameter("messageRate", 5 , LiveObjects.INT, callback) #Add parameter: Name - Value - Type - Callback
1818
#Available types: INT BINARY STRING FLOAT
1919
lo.connect() #Connect to LiveObjects
2020
last = time.time()

‎4_simple_command.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
import sys
33
import time
44

5-
from LiveObjectsSDK.Connection import *
5+
import LiveObjects
66

7-
#Create LiveObjects with parameters: ClientID - Port - APIKEY
8-
lo = LiveObjects("PythonMQTT", 1883, "<APIKEY>")
7+
#Create LiveObjects with parameters: ClientID - Security - APIKEY
8+
lo = LiveObjects.Connection("PythonMQTT", LiveObjects.NONE, "<APIKEY>")
99

1010
messageRate = 5
1111

1212
#Define command function
1313
def foo(arg={}):
14-
lo.outputDebug(INFO,"Called function foo")
14+
lo.outputDebug(LiveObjects.INFO,"Called function foo")
1515
return {}
1616

1717
#Main program

‎5_command_with_arguments.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import os
22
import sys
33
import time
4+
import json
5+
import LiveObjects
46

5-
from LiveObjectsSDK.Connection import *
6-
7-
#Create LiveObjects with parameters: ClientID - Port - APIKEY
8-
lo = LiveObjects("PythonMQTT", 1883, "<APIKEY>")
7+
#Create LiveObjects with parameters: ClientID - Security - APIKEY
8+
lo = LiveObjects.Connection("PythonMQTT", LiveObjects.NONE, "<APIKEY>")
99

1010
messageRate = 5
1111

1212
#Define command function with arguments handling
1313
def foo(args={}):
14-
lo.outputDebug(INFO,"Called function foo with args", json.dumps(args))
14+
lo.outputDebug(LiveObjects.INFO,"Called function foo with args", json.dumps(args))
1515
counter = 0
1616
for i in range(args["repetitions"]):
1717
print("Repetition nr "+str(i))

‎LiveObjectsSDK/Connection.py‎ renamed to ‎LiveObjects/Connection.py‎

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,16 @@
1111
WARNING = "WARNING"
1212
ERROR = "ERROR"
1313

14+
SSL = 8883
15+
NONE = 1883
16+
1417
class LiveObjectsParameter:
1518
def __init__(self,value,type_, cb = None):
1619
self.value = value
1720
self.type = type_
1821
self.callback = cb
1922

20-
class LiveObjects:
23+
class Connection:
2124
def __init__(self, deviceID, port, apiKey, debug = True):
2225
try:
2326
if sys.platform == "linux" or sys.platform=="win32":
@@ -115,41 +118,21 @@ def disconnect(self):
115118

116119
def outputDebug(self,info, *args):
117120
if self.__doLog:
118-
# if self.mode == 1:
119-
# print("[", datetime.datetime.now().strftime("%d-%m-%Y %H:%M:%S"), "]", end="", sep="")
120-
# print("[",info,"]", end=" ", sep="")
121-
# for arg in args:
122-
# print(arg, end=" ")
123-
# print("")
124-
# else:
125121
print("[", info, "]", end=" ", sep="")
126122
for arg in args:
127123
print(arg, end=" ")
128124
print("")
129-
def __outputDebugS(self,info, *args):
130-
if self.__doLog:
131-
# if self.mode == 1:
132-
# print("[", datetime.datetime.now().strftime("%d-%m-%Y %H:%M:%S"), "]", end="", sep="")
133-
# print("[",info,"]", end=" ", sep="")
134-
# for arg in args:
135-
# print(arg, end="")
136-
# print("")
137-
# else:
138-
print("[", info, "]", end=" ", sep="")
139-
for arg in args:
140-
print(arg, end="")
141-
print("")
142125

143126
def addCommand(self, name, cmd):
144127
self.__commands[name] = cmd
145128

146129
def __commandManager(self,msg):
147130
if self.mode ==1:
148131
msgDict = json.loads(msg.payload)
149-
self.__outputDebugS(INFO, "Received message:\n", json.dumps(msgDict, sort_keys=True, indent=4))
132+
self.outputDebug(INFO, "Received message:\n", json.dumps(msgDict, sort_keys=True, indent=4))
150133
else:
151134
msgDict = json.loads(msg)
152-
self.__outputDebugS(INFO, "Received message:", json.dumps(msgDict))
135+
self.outputDebug(INFO, "Received message:", json.dumps(msgDict))
153136
outputMsg = {}
154137
outputMsg["cid"] = msgDict["cid"]
155138
response = self.__commands.get(msgDict["req"], self.__default)(msgDict["arg"])
@@ -170,11 +153,11 @@ def __sendConfig(self):
170153
def __parameterManager(self, msg):
171154
if self.mode == 1:
172155
self.outputDebug(INFO,"Received message: ")
173-
self.__outputDebugS(INFO,json.loads(msg.payload))
156+
self.outputDebug(INFO,json.loads(msg.payload))
174157
params = json.loads(msg.payload)
175158
else:
176159
self.outputDebug(INFO, "Received message: ")
177-
self.__outputDebugS(INFO, json.loads(msg))
160+
self.outputDebug(INFO, json.loads(msg))
178161
params = json.loads(msg)
179162
for param in params["cfg"]:
180163
if params["cfg"][param]["t"] == "i32":
@@ -232,7 +215,7 @@ def sendData(self):
232215
def __publishMessage(self, topic, msg):
233216
self.outputDebug(INFO, "Publishing message on topic: ", topic)
234217
if self.mode == 1:
235-
self.__outputDebugS(INFO, "\n", json.dumps(msg, sort_keys=True, indent=4))
218+
self.outputDebug(INFO, "\n", json.dumps(msg, sort_keys=True, indent=4))
236219
else:
237-
self.__outputDebugS(INFO, json.dumps(msg))
220+
self.outputDebug(INFO, json.dumps(msg))
238221
self.__mqtt.publish(topic, json.dumps(msg))

‎LiveObjects/__init__.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
from LiveObjects.Connection import *
2+
import json
3+
import time
4+
import os
5+
import sys

‎LiveObjectsSDK/certfile.cer‎ renamed to ‎LiveObjects/certfile.cer‎

File renamed without changes.

‎LiveObjectsSDK/__init__.py‎

Whitespace-only changes.

‎LiveObjectsSDK/ssl.py‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)