setup for buster - wip

Author: winemug

configuration.py

@@ -1,12 +1,6 @@
 import glob
 import sqlite3
 import time
-import os
-from datetime import datetime
-
-import jsonpickle
-
-from configuration import OmnipyConfiguration
 from podcomm.pdm import Pdm, PdmLock
 from podcomm.pod import Pod
 from podcomm.pr_rileylink import RileyLink
@@ -29,11 +23,7 @@ def __init__(self):
         self.logger.info("mq operator is starting")
 
         with open("settings.json", "r") as stream:
-            lines = stream.read()
-            txt = ""
-            for line in lines:
-                txt = txt + line
-        self.configuration = jsonpickle.decode(txt)
+            self.settings = json.load(stream)
         self.client = mqtt.Client(client_id=self.configuration.mqtt_clientid, protocol=mqtt.MQTTv311)
         self.client.on_connect = self.on_connect
         self.client.on_disconnect = self.on_disconnect
@@ -77,8 +67,8 @@ def run(self):
         connected = False
         while not connected:
             try:
-                self.client.connect(self.configuration.mqtt_host,
-                                    self.configuration.mqtt_port, clean_start=mqtt.MQTT_CLEAN_START_FIRST_ONLY)
+                self.client.connect(self.settings["mqtt_host"],
+                                    self.settings["mqtt_port"], clean_start=mqtt.MQTT_CLEAN_START_FIRST_ONLY)
                 connected = True
             except:
                 time.sleep(30)
@@ -87,14 +77,14 @@ def run(self):
 
     def on_connect(self, client: mqtt.Client, userdata, flags, rc):
         self.send_msg("Well hello there")
-        client.subscribe(self.configuration.mqtt_command_topic, qos=2)
-        client.subscribe(self.configuration.mqtt_sync_request_topic, qos=1)
+        client.subscribe(self.settings["mqtt_command_topic"], qos=2)
+        client.subscribe(self.settings["mqtt_sync_request_topic"], qos=1)
         self.ntp_update()
 
     def on_message(self, client, userdata, message: mqtt.MQTTMessage):
         try:
             cmd_str = message.payload.decode()
-            if message.topic == self.configuration.mqtt_command_topic:
+            if message.topic == self.settings["mqtt_command_topic"]:
                 cmd_split = cmd_str.split(' ')
                 if cmd_split[0] == "temp":
                     temp_rate = self.fix_decimal(cmd_split[1])
@@ -115,7 +105,7 @@ def on_message(self, client, userdata, message: mqtt.MQTTMessage):
                     os.system('sudo shutdown -r now')
                 else:
                     self.send_msg("lol what?")
-            elif message.topic == self.configuration.mqtt_sync_request_topic:
+            elif message.topic == self.settings["mqtt_sync_request_topic"]:
                 if cmd_str == "latest":
                     self.send_result(self.i_pod)
                 else:
@@ -291,12 +281,13 @@ def send_result(self, pod):
         msg = pod.GetString()
         if pod.pod_id is None:
             return
-        self.client.publish(self.configuration.mqtt_json_topic,
+        self.client.publish(self.settings["mqtt_json_topic"],
                             payload=msg, qos=1)
+        self.client.publish(self.settings["mqtt_status_topic"], payload=msg, qos=1, retain=True)
 
     def send_msg(self, msg):
         self.logger.info(msg)
-        self.client.publish(self.configuration.mqtt_response_topic,
+        self.client.publish(self.settings["mqtt_response_topic"],
                             payload=msg, qos=1)
 
     def ntp_update(self):
@@ -334,7 +325,7 @@ def fill_request(self, pod_id, req_ids):
                     js["last_command_db_id"] = row[0]
                     js["last_command_db_ts"] = row[1]
 
-                    self.client.publish(self.configuration.mqtt_json_topic,
+                    self.client.publish(self.settings["mqtt_json_topic"],
                                         payload=json.dumps(js), qos=0)
                 cursor.close()
 

mq.py

@@ -1,36 +0,0 @@
-appdirs==1.4.4
-asn1crypto==1.3.0
-certifi==2020.6.20
-cffi==1.14.0
-chardet==3.0.4
-cryptography==2.9.2
-distlib==0.3.1
-distro==1.5.0
-entrypoints==0.3
-filelock==3.0.12
-Flask==1.1.2
-idna==2.10
-importlib-metadata==1.7.0
-jeepney==0.4.3
-jsonpickle==1.4.1
-Mako==1.1.3
-Markdown==3.2.2
-MarkupSafe==1.1.1
-paho-mqtt==1.5.0
-pycairo==1.19.1
-pycparser==2.20
-pycrypto==2.6.1
-Pygments==2.6.1
-PyGObject==3.36.1
-pyxdg==0.26
-PyYAML==5.3.1
-requests==2.24.0
-SecretStorage==3.1.2
-setuptools==49.2.0
-simplejson==3.17.2
-six==1.15.0
-ssh-import-id==5.10
-urllib3==1.25.9
-virtualenv==20.0.27
-zipp==1.2.0
-rpi-gpio==0.7.0

requirements.txt

@@ -25,55 +25,18 @@ sudo apt install -y screen git python3 python3-pip vim jq bluez-tools libglib2.0
 bluez-tools python3-pip python3-venv gobject-introspection libgirepository1.0-dev libcairo2-dev expect build-essential \
 libdbus-1-dev libudev-dev libical-dev libreadline-dev rpi-update
 
-
-
-# sudo apt install -y hostapd dnsmasq
-# sudo systemctl disable hostapd
-# sudo systemctl unmask hostapd
-# sudo systemctl disable dnsmasq
-# sudo systemctl enable hostapd
-# sudo systemctl enable dnsmasq
-# sudo systemctl start hostapd
-# sudo systemctl stop hostapd
-# sudo systemctl stop dnsmasq
-# sudo cp /home/pi/omnipy/scripts/image/default.dnsmasq /etc/default/dnsmasq
-# sudo cp /home/pi/omnipy/scripts/image/default.hostapd /etc/default/hostapd
-# sudo cp /home/pi/omnipy/scripts/image/hostapd.conf /etc/hostapd/
-# sudo cp /home/pi/omnipy/scripts/image/dnsmasq.conf /etc/dnsmasq.d/
-# sudo cp /home/pi/omnipy/scripts/image/dhcpcd.conf /etc/
-
 git config --global user.email "omnipy@balya.net"
 git config --global user.name "Omnipy Setup"
 git clone https://github.com/winemug/omnipy.git
-#switch to dev
 git clone https://github.com/winemug/bluepy.git
-sudo cp /home/pi/omnipy/scripts/image/rc.local /etc/
-
-
-#sudo /bin/rm /boot/.firmware_revision
-#sudo cp /home/pi/omnipy/scripts/image/rpiupdate.sh /usr/bin/rpiupdate
-#sudo git clone https://github.com/Hexxeh/rpi-firmware.git /root/.rpi-firmware
-#sudo ROOT_PATH=/ BOOT_PATH=/boot SKIP_DOWNLOAD=0 SKIP_REPODELETE=1 SKIP_BACKUP=1 UPDATE_SELF=0 RPI_REBOOT=1 BRANCH=next rpi-update 502a515156eebbfd3cc199de8f38a975c321f20d
-#reboot
-#wget https://github.com/Hexxeh/rpi-firmware/archive/master.zip
-#unzip master.zip
-#sudo mv rpi-firmware-master /root/.rpi-firmware
 
+mkdir -p /home/pi/omnipy/data
+rm /home/pi/omnipy/data/key
+cp /home/pi/omnipy/scripts/recovery.key /home/pi/omnipy/data/key
 
-#https://raspberrypi.stackexchange.com/questions/66540/installing-bluez-5-44-onto-raspbian
-#wget https://mirrors.edge.kernel.org/pub/linux/bluetooth/bluez-5.50.tar.gz
-#tar xzf bluez-5.50.tar.gz
-#cd bluez-5.50
-#./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc --localstatedir=/var --disable-cups --disable-a2dp --disable-avrcp --disable-hid --disable-hog --enable-experimental
-#make -j4
-#sudo make install
+### omnipy-base image end
 
-#cd /usr/lib/bluetooth/
-#sudo mv bluetoothd bluetoothd.old
-#sudo mv obexd obexd.old
-#sudo ln -s /usr/libexec/bluetooth/bluetoothd /usr/lib/bluetooth/bluetoothd
-#sudo ln -s /usr/libexec/bluetooth/obexd /usr/lib/bluetooth/obexd
-#sudo systemctl daemon-reload
+sudo cp /home/pi/omnipy/scripts/image/rc.local /etc/
 
 sudo pip3 install simplejson Flask cryptography requests
 
@@ -94,12 +57,6 @@ sudo find /home/pi -name bluepy-helper -exec setcap 'cap_net_raw,cap_net_admin+e
 
 sudo apt autoremove
 
-
-
-mkdir -p /home/pi/omnipy/data
-rm /home/pi/omnipy/data/key
-cp /home/pi/omnipy/scripts/recovery.key /home/pi/omnipy/data/key
-
 sudo cp /home/pi/omnipy/scripts/omnipy.service /etc/systemd/system/
 sudo cp /home/pi/omnipy/scripts/omnipy-beacon.service /etc/systemd/system/
 sudo cp /home/pi/omnipy/scripts/omnipy-pan.service /etc/systemd/system/