diff --git a/python/adeunisrf.py b/python/adeunisrf.py index a4fccd8..4987c66 100644 --- a/python/adeunisrf.py +++ b/python/adeunisrf.py @@ -26,7 +26,7 @@ import sys log = logging.getLogger("adeunis") log.setLevel(logging.DEBUG) -known_devices = [ "0018B20000000C58", "0018B20000000C37", "0018B20000000C59", "0018B20000000CD0" ] +known_devices = [ "0018B20000000C58", "0018B20000000C37", "0018B20000000C59", "0018B20000000CD0", "0018B200000001C5" ] def convert_gps_from_stdin(): for line in sys.stdin: diff --git a/python/lorautil.py b/python/lorautil.py index 479f6ba..29f97ef 100644 --- a/python/lorautil.py +++ b/python/lorautil.py @@ -87,7 +87,6 @@ def pg_wait_for_pkg(conns, callback): callback(notify.channel, notify.payload) - class DB(object): def __init__(self, query): self.query = query diff --git a/sodaq_one/Sodaq_RN2483.cpp b/sodaq_one/Sodaq_RN2483.cpp deleted file mode 120000 index 5102a89..0000000 --- a/sodaq_one/Sodaq_RN2483.cpp +++ /dev/null @@ -1 +0,0 @@ -../Sodaq_RN2483.cpp \ No newline at end of file diff --git a/sodaq_one/Sodaq_RN2483.h b/sodaq_one/Sodaq_RN2483.h deleted file mode 120000 index 515c9e8..0000000 --- a/sodaq_one/Sodaq_RN2483.h +++ /dev/null @@ -1 +0,0 @@ -../Sodaq_RN2483.h \ No newline at end of file diff --git a/sodaq_one/StringLiterals.h b/sodaq_one/StringLiterals.h deleted file mode 120000 index 83e008e..0000000 --- a/sodaq_one/StringLiterals.h +++ /dev/null @@ -1 +0,0 @@ -../StringLiterals.h \ No newline at end of file diff --git a/sodaq_one/Switchable_Device.cpp b/sodaq_one/Switchable_Device.cpp deleted file mode 120000 index 5fb5dda..0000000 --- a/sodaq_one/Switchable_Device.cpp +++ /dev/null @@ -1 +0,0 @@ -../Switchable_Device.cpp \ No newline at end of file diff --git a/sodaq_one/Switchable_Device.h b/sodaq_one/Switchable_Device.h deleted file mode 120000 index 0c82682..0000000 --- a/sodaq_one/Switchable_Device.h +++ /dev/null @@ -1 +0,0 @@ -../Switchable_Device.h \ No newline at end of file diff --git a/sodaq_one/Utils.h b/sodaq_one/Utils.h deleted file mode 120000 index 70d35c6..0000000 --- a/sodaq_one/Utils.h +++ /dev/null @@ -1 +0,0 @@ -../Utils.h \ No newline at end of file diff --git a/sodaq_one/gps.ino b/sodaq_one/gps.ino index d1516a1..70c9978 100644 --- a/sodaq_one/gps.ino +++ b/sodaq_one/gps.ino @@ -3,7 +3,7 @@ void gpsSetup() { sodaq_gps.init(GPS_ENABLE); - } +} /* FIXME: find out power consumption if turned off */ // void gpsStop() { sodaq_gps.off(); } diff --git a/sodaq_one/nsarduino.h b/sodaq_one/nsarduino.h index e820d27..79c872a 100644 --- a/sodaq_one/nsarduino.h +++ b/sodaq_one/nsarduino.h @@ -25,3 +25,8 @@ void sendPacket(String packet); /* sunlight.ino */ String getSunLight(); void setupSunLight(); + +/* gps.ino */ +void gpsSetup(); +String gpsGetPostion(long waittime); +String gpsGetDateTime(long waittime);