Feature support rtl_433 input

snap/snapcraft.yaml

@@ -12,9 +12,10 @@ description: |
     Release Notes:
     * Drop support for armhf
     * Enabled client GUI using fixgateway.client --gui
-    * Updated to core24 and python 3.12
+      The GUI is not stable but usable
 
     Many new plugins that need your help testing:
+    * rtl_433, collect data from wirelss sensors such as TPMS
     * dynon, collects AHRS data from Dynon D10/D100
     * gpsd, obtains GPS data from gpsd network daemon
     * mgl_serial RS-232 protocol, currently lacks custom configuration
@@ -46,6 +47,16 @@ platforms:
 base: core24
 confinement: strict
 
+layout:
+  /usr/share/X11/locale:
+    symlink: $SNAP/gpu-2404/X11/locale
+  /usr/share/X11/xkb:
+    bind: $SNAP/usr/share/X11/xkb
+  /etc/fonts:
+    bind: $SNAP/etc/fonts
+  /usr/share/fonts:
+    bind: $SNAP/usr/share/fonts
+
 parts:
   extras:
     source: ./extras
@@ -57,11 +68,18 @@ parts:
     override-build: |
       craftctl default
       craftctl set version=$(python3 src/fixgw/version.py)
+      echo "Fixing RPATH for ELF binaries..."
+      find $SNAPCRAFT_PART_INSTALL -type f \( -name "*.so*" -o -perm -111 \) -exec sh -c '
+        if file "$1" | grep -q "ELF"; then
+          echo "Patching RPATH for $1"
+          patchelf --set-rpath "$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR" "$1"
+        fi
+      ' sh {} \;
+
     stage-packages:
+      - patchelf
       - libxcb-cursor0
       - libarchive13t64
-      - cmake
-      - build-essential
       - python3.12-minimal
       - libpython3.12-minimal
       - libpython3.12-stdlib
@@ -72,30 +90,41 @@ parts:
       - python3-psutil
       - python3-pyqt6
       - libblas3
-      - libc6
       - liblapack3
       - python3-packaging
-      - libc6-dev
-      - libblas-dev
-      - liblapack-dev
-      - libopenblas-dev
-      - python3-dev
-      - libhdf5-serial-dev
       - python3-tables
       - gcc
       - g++
-      - libhdf5-dev
       - pkg-config
       - bzip2
       - lzop
-      - rtl-433
+      - xkb-data
+      - x11-xkb-utils
+      - locales-all
+      - libxkbcommon0
+      - fonts-dejavu-core
+      - fonts-dejavu-extra
+      - libopenblas0
+      - libhdf5-103-1t64
+#      - librtlsdr2
+#      - libusb-1.0-0
     build-environment:
       - PARTS_PYTHON_INTERPRETER: python3.12
 #      - PIP_VERBOSE: 3
       - PARTS_PYTHON_VENV_ARGS: --system-site-packages
       - PIP_NO_UPGRADE: "1"
     build-packages:
+      - file
       - execstack
+      - libc6-dev
+      - cmake
+      - build-essential
+      - libblas-dev
+      - liblapack-dev
+      - libopenblas-dev
+      - python3-dev
+      - libhdf5-dev
+
 # Remove exec stack bit from files causing manual review
     override-prime: |
       set -eu
@@ -105,26 +134,70 @@ parts:
           execstack -c $f
         fi
       done
+
+  rtl-433:
+    plugin: cmake
+#    source: https://github.com/merbanan/rtl_433.git
+    source: https://github.com/e100/rtl_433.git
+#    source-tag: '24.10'
+    source-tag: 'gm_tpms'
+    source-depth: 1
+    source-type: git
+    build-packages:
+      - file
+      - build-essential
+      - cmake
+      - librtlsdr-dev
+      - libusb-1.0-0-dev
+      - pkg-config
+      - git
+      - libc6-dev
+    stage-packages:
+      - librtlsdr2
+      - libusb-1.0-0
+      - patchelf
+    cmake-parameters:
+      - -DCMAKE_INSTALL_PREFIX=/usr
+    build-attributes:
+      - enable-patchelf
+    override-build: |
+      snapcraftctl build
+      # Ensure correct RPATH (use libc6 from core24)
+      patchelf --set-rpath "/snap/core24/current/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR" $SNAPCRAFT_PART_INSTALL/usr/bin/rtl_433
+      echo "Fixing RPATH for ELF binaries..."
+      find $SNAPCRAFT_PART_INSTALL -type f \( -name "*.so*" -o -perm -111 \) -exec sh -c '
+        if file "$1" | grep -q "ELF"; then
+          echo "Patching RPATH for $1"
+          patchelf --set-rpath "$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR" "$1"
+        fi
+      ' sh {} \;
+    override-prime: |
+      set -eu
+      craftctl default
+      # Ensure libc6 is removed (use core24's libc6 instead)
+      rm -rf $SNAPCRAFT_PRIME/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libc.so.*
+      rm -rf $SNAPCRAFT_PRIME/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libc.so.*
 apps:
-  rtl433:
+  rtl-433:
     command: usr/bin/rtl_433
     plugs:
-      - raw-usb
       - network
+      - network-bind
+      - raw-usb
   daemon:
     command: bin/fixgw
     daemon: simple
     daemon-scope: user
     # Woud be nice to also support options: https://snapcraft.io/docs/adding-snap-configuration
     restart-condition: always
-    plugs: [ home, network-bind, network, can-bus, serial-port, i2c, spi]
+    plugs: [ home, network-bind, network, can-bus, serial-port, i2c, spi, raw-usb]
     environment:
       PATH: $SNAP/bin:$SNAP/usr/bin:$SNAP/usr/local/bin:$PATH
       PYTHONPATH: $SNAP/lib/python3.12/site-packages:$SNAP/usr/lib/python3/dist-packages:$PYTHONPATH
 
   server:
     command: bin/fixgw
-    plugs: [ home, network-bind, network, can-bus, serial-port, i2c, spi]
+    plugs: [ home, network-bind, network, can-bus, serial-port, i2c, spi, raw-usb]
     environment:
       PATH: $SNAP/bin:$SNAP/usr/bin:$SNAP/usr/local/bin:$PATH
       PYTHONPATH: $SNAP/lib/python3.12/site-packages:$SNAP/usr/lib/python3/dist-packages:$PYTHONPATH
@@ -137,11 +210,13 @@ apps:
       - desktop-legacy
       - wayland
       - x11
+      - home
 
     environment:
       PATH: $SNAP/bin:$SNAP/usr/bin:$SNAP/usr/local/bin:$PATH
       PYTHONPATH: $SNAP/lib/python3.12/site-packages:$SNAP/usr/lib/python3/dist-packages:$PYTHONPATH
       QT_PLUGIN_PATH: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt6/plugins/
       QT_QPA_PLATFORM: xcb
-
-
+      XKB_CONFIG_ROOT: $SNAP/usr/share/X11/xkb
+      QT_XKB_CONFIG_ROOT: $SNAP/usr/share/X11/xkb
+      QT_NO_SESSION_MANAGER: 1

src/fixgw/__init__.py

@@ -1 +1,2 @@
-__version__ = "2.2.0"
+__version__ = "2.2.1"
+

src/fixgw/client/table.py

@@ -35,7 +35,7 @@ def setChecked(self, value):
 class DataTable(QTableWidget):
     def __init__(self, parent=None):
         super(DataTable, self).__init__(parent)
-        cols = ["Value", "A", "O", "B", "F", "S", "Description"]
+        cols = ["Value", "Annun", "Old", "Bad", "Fail", "SFail", "Description"]
         self.setColumnCount(len(cols))
         self.setHorizontalHeaderLabels(cols)
         self.horizontalHeader().setSectionResizeMode(

src/fixgw/config/connections/rtl_433.yaml

@@ -0,0 +1,53 @@
+rtl_433:
+  load: RTL_433
+  module: fixgw.plugins.rtl_433
+  frequency: 433920000
+  rtl_device: 0
+  #simulate: true
+  sensors:
+    - sensor_id: 2018052400   # TPMS ID for front wheel
+      decoder: 275  # The decoder needed to capture this data
+      mappings:
+        TIREP1:
+          source: "pressure_kPa"
+          #scale: 6.89476  # Convert kPa to PSI
+          round: 1
+          type: "float"
+        TIRET1:
+          source: "temperature_C"
+          #offset: -40
+          round: 0
+          type: "float"
+        TIREB1:
+          source: "battery_ok"
+          #threshold: 2.0  # Battery OK if voltage > 2.0 (1 = OK, 0 = Low)
+          type: "bool"
+    - sensor_id: 2017934177   # TPMS ID for front wheel
+      decoder: 275  # The decoder needed to capture this data
+      mappings:
+        TIREP2:
+          source: "pressure_kPa"
+          round: 1
+          type: "float"
+        TIRET2:
+          source: "temperature_C"
+          round: 0
+          type: "float"
+        TIREB2:
+          source: "battery_ok"
+          type: "bool"
+    - sensor_id: 2017968551   # TPMS ID for front wheel
+      decoder: 275  # The decoder needed to capture this data
+      mappings:
+        TIREP3:
+          source: "pressure_kPa"
+          round: 1
+          type: "float"
+        TIRET3:
+          source: "temperature_C"
+          round: 0
+          type: "float"
+        TIREB3:
+          source: "battery_ok"
+          type: "bool"
+

src/fixgw/config/database.yaml

@@ -17,6 +17,7 @@ entries:
 - include: database/system.yaml
 - include: database/control.yaml
 - include: database/misc.yaml
+- include: database/tires.yaml
 #################################################
 # If you want to modify or add new items place do so in the file
 # database/custom.yaml

src/fixgw/config/database/tires.yaml

@@ -0,0 +1,26 @@
+items:
+- key: TIREPw
+  description: Tire %w Pressure
+  type: float
+  tol: 300000 # 5 minutes
+  units: psi
+  min: 0.0
+  max: 150.0
+  initial: 0.0
+  aux: [Min,Max,lowWarn,highWarn,lowAlarm,highAlarm]
+
+- key: TIRETw
+  description: Tire %w Temperature
+  type: float
+  tol: 300000 # 5 minutes
+  units: degC
+  min: -50.0
+  max: 85.0
+  initial: 0.0
+  aux: [highWarn,highAlarm]
+
+- key: TIREBw
+  description: Tire %w Battery Status
+  type: bool
+  tol: 300000 # 5 minutes
+  initial: false

src/fixgw/config/database/variables.yaml

@@ -11,4 +11,4 @@ variables:
   n: 5  # Nodes
   s: 40 # Touchscreen buttons
   d: 4  # MGL V16 Radios
-
+  w: 3  # Wheels

src/fixgw/config/default.yaml

@@ -17,6 +17,7 @@ auto start: true
 # Plugins may overwrite this data as well.
 initialization files:
    - "{CONFIG}/init_data/default.ini"
+   - "{CONFIG}/init_data/tires.ini"
   # - "{CONFIG}/init_data/airplanes/cessna/c170b.ini"
   # - "{CONFIG}/init_data/flight_gear/cessna_172.ini"
   # - "{CONFIG}/init_data/engines/aeromomentum/am13.ini"
@@ -66,7 +67,7 @@ connections:
   - STROM_PI_CONFIG
   - DYNON_CONFIG
   - DEMO_CONFIG
-
+  - RTL_433_CONFIG
 # Logging configuration - See Python logging.config module documenation
 # This is logging for system messages, not system data
 # If you want a Flight Data Recorder, see the file connections/data_recorder.yaml

src/fixgw/config/init_data/tires.ini

@@ -0,0 +1,30 @@
+# normal 15 psi
+TIREP1.Min = 13
+TIREP1.Max = 16
+TIREP1.lowWarn =  13
+TIREP1.lowAlarm = 10
+TIREP1.highWarn =  16
+TIREP1.highAlarm = 18
+
+TIREP2.Min = 13
+TIREP2.Max = 16
+TIREP2.lowWarn =  13
+TIREP2.lowAlarm = 10
+TIREP2.highWarn =  16
+TIREP2.highAlarm = 18
+
+TIREP3.Min = 13
+TIREP3.Max = 16
+TIREP3.lowWarn =  13
+TIREP3.lowAlarm = 10
+TIREP3.highWarn =  16
+TIREP3.highAlarm = 18
+
+TIRET1.highWarn = 75
+TIRET1.highAlarm = 85
+
+TIRET2.highWarn = 75
+TIRET2.highAlarm = 85
+
+TIRET3.highWarn = 75
+TIRET3.highAlarm = 85

src/fixgw/config/preferences.yaml

@@ -37,6 +37,7 @@ includes:
   STROM_PI_CONFIG: connections/strom_pi.yaml
   DYNON_CONFIG: connections/dynon.yaml
   DEMO_CONFIG: connections/demo.yaml
+  RTL_433_CONFIG: connections/rtl_433.yaml
 # This section is used to turn things on or off
 enabled:
   QUORUM: false
@@ -69,4 +70,4 @@ enabled:
   STROM_PI: false
   DYNON: false
   DEMO: true
-
+  RTL_433: false

src/fixgw/plugin.py

@@ -40,11 +40,12 @@ class PluginFail(Exception):
 # inherit this class and override at least the run function.  See the
 # skel.py file in the plugins directory for a basic example.
 class PluginBase(object):
-    def __init__(self, name, config):
+    def __init__(self, name, config, config_meta):
         self.name = name
         self.log = logging.getLogger("fixgw." + name)
         self.log.info("Initializing")
         self.config = config
+        self.config_meta = config_meta
         self.log.debug("Config: " + str(self.config))
 
         self.running = False

src/fixgw/plugins/annunciate.py

@@ -168,8 +168,8 @@ def __str__(self):
 
 
 class Plugin(plugin.PluginBase):
-    def __init__(self, name, config):
-        super(Plugin, self).__init__(name, config)
+    def __init__(self, name, config, config_meta):
+        super(Plugin, self).__init__(name, config, config_meta)
         self.items = []
 
     def run(self):

src/fixgw/plugins/canfix/__init__.py

@@ -144,8 +144,8 @@ def stop(self):
 
 
 class Plugin(plugin.PluginBase):
-    def __init__(self, name, config):
-        super(Plugin, self).__init__(name, config)
+    def __init__(self, name, config, config_meta):
+        super(Plugin, self).__init__(name, config, config_meta)
         self.interface = config["interface"]
         self.channel = config["channel"]
         self.device = int(config["device"])