Compare commits

...

4 Commits

Author SHA1 Message Date
sessionm21
d39b4e8494 update protobuf 2020-05-13 04:14:23 +01:00
sessionm21
4162cead3d add gitignore 2020-05-12 22:11:58 +01:00
sessionm21
4a8b2474b8 move keys to config file 2020-05-12 22:11:33 +01:00
sessionm21
d86cd5b72e seperate the tests 2020-05-12 22:01:21 +01:00
5 changed files with 26 additions and 10 deletions

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
config.ini

3
config.ini Normal file
View File

@@ -0,0 +1,3 @@
[Default]
AppId=app_id
AccessKey=ttn-account-v2.redacted

15
main.py
View File

@@ -4,9 +4,12 @@ import base64
import message_pb2 import message_pb2
import sqlite3 import sqlite3
app_id = "fenceles_grazing" import configparser
access_key = "ttn-account-v2.XVvtBVcWzkeby-fe9eLtiJBLRbjQR-b358S4z70Xa-0" config = configparser.ConfigParser()
config.read("config.ini")
app_id = config['Default']['AppId']
access_key = config['Default']['AccessKey']
# For now use collar id of 1, should look up collar id based on collarname from db # For now use collar id of 1, should look up collar id based on collarname from db
def store_coord(collarname, x, y): def store_coord(collarname, x, y):
@@ -41,14 +44,6 @@ def on_message(client, userdata, msg):
res.ParseFromString(bcode) res.ParseFromString(bcode)
store_coord(payload['dev_id'], res.loc.x, res.loc.y) store_coord(payload['dev_id'], res.loc.x, res.loc.y)
# Test protobuf here
# code = bytearray('CgoNAAAAABUAAAAA', "utf-8")
# print(code)
# bcode = base64.b64decode(code)
# res = message_pb2.CollarResponse()
# res.ParseFromString(bcode)
# print("Coord {x: " + str(res.loc.x) + ", y: " + str(res.loc.y) + "}")
client = mqtt.Client() client = mqtt.Client()
client.on_connect = on_connect client.on_connect = on_connect
client.on_message = on_message client.on_message = on_message

View File

@@ -9,6 +9,7 @@ message Coordinate {
message CollarResponse { message CollarResponse {
required Coordinate loc = 1; required Coordinate loc = 1;
required int32 oob = 2;
} }
message Coordinates { message Coordinates {

16
tests.py Normal file
View File

@@ -0,0 +1,16 @@
import paho.mqtt.client as mqtt
import json
import base64
import message_pb2
import sqlite3
# Test protobuf here
code = bytearray('CgoNAAAAABUAAAAA', "utf-8")
print(code)
bcode = base64.b64decode(code)
res = message_pb2.CollarResponse()
res.ParseFromString(bcode)
assert res.loc.x == 0
assert res.loc.y == 0
print("Coord {x: " + str(res.loc.x) + ", y: " + str(res.loc.y) + "}")