Merge pull request #487 from CameronRP/update-test

Update test

Author: CameronRP

tc2/basics/config.txt

@@ -49,5 +49,8 @@ gpio=6,12=ip,pd
 # Set SWD pins to input so RP2040 can be programmed externally.
 gpio=25,24=ip
 
+# Set I2C lock pin to a pull-up input.
+gpio=13=ip,pu
+
 # Set GPIO pin to trigger shutdown.
 dtoverlay=gpio-shutdown,debounce=1,gpio_pin=26,gpio_pull=up

tc2/event-reporter/init.sls

@@ -1,7 +1,7 @@
 event-reporter-pkg:
   cacophony.pkg_installed_from_github:
     - name: event-reporter
-    - version: "3.12.1"
+    - version: "3.12.2"
     - architecture: "arm64"
     - branch: "master"
 

tc2/rpi-net-manager/init.sls

@@ -1,7 +1,7 @@
 rpi-net-manager-pkg:
   cacophony.pkg_installed_from_github:
     - name: rpi-net-manager
-    - version: "0.7.1"
+    - version: "0.7.3"
     - architecture: "arm64"
 
 rpi-net-manager-service:

tc2/rtl8821au/init.sls

@@ -1,8 +1,7 @@
 {% from "tc2/rtl8821au/map.jinja" import rtl8821au with context %}
 {% set device_present = salt['cacophony.has_usb_device'](rtl8821au['device_ids']) %}
-{% set install_marker = rtl8821au['install_marker'] %}
-{% set already_installed = salt['file.file_exists'](install_marker) %}
-{% set should_install = rtl8821au['auto_update'] or not already_installed %}
+{% set driver_installed = salt['cmd.retcode'](['modinfo', '8821au']) == 0 %}
+{% set should_install = rtl8821au['auto_update'] or not driver_installed %}
 {% set install_command = "./install-driver.sh" %}
 {% if rtl8821au['install_args'] %}
   {% set install_command = install_command + " " + " ".join(rtl8821au['install_args']) %}
@@ -17,6 +16,16 @@ rtl8821au-deps:
 {% endif %}
 
 {% if should_install %}
+rtl8821au-disable-tc2-agent:
+  service.dead:
+    - name: tc2-agent
+    - enable: False
+
+rtl8821au-disable-tc2-hat-attiny:
+  service.dead:
+    - name: tc2-hat-attiny
+    - enable: False
+
 rtl8821au-source:
   git.latest:
     - name: {{ rtl8821au['repo'] }}
@@ -28,9 +37,6 @@ rtl8821au-source:
       - pkg: rtl8821au-deps
 {% endif %}
     - user: root
-{% if not rtl8821au['auto_update'] %}
-    - unless: test -f "{{ install_marker }}"
-{% endif %}
 
 rtl8821au-install:
   cmd.run:
@@ -39,6 +45,8 @@ rtl8821au-install:
     - unless: modinfo 8821au
     - require:
       - git: rtl8821au-source
+      - service: rtl8821au-disable-tc2-agent
+      - service: rtl8821au-disable-tc2-hat-attiny
 
 rtl8821au-reinstall:
   cmd.run:
@@ -49,21 +57,32 @@ rtl8821au-reinstall:
       - git: rtl8821au-source
     - require:
       - git: rtl8821au-source
+      - service: rtl8821au-disable-tc2-agent
+      - service: rtl8821au-disable-tc2-hat-attiny
 
-rtl8821au-marker:
-  file.managed:
-    - name: {{ install_marker }}
-    - contents: installed
-    - makedirs: True
-    - onlyif: modinfo 8821au
+rtl8821au-enable-tc2-agent:
+  service.running:
+    - name: tc2-agent
+    - enable: True
     - require:
-      - git: rtl8821au-source
-    - unless: test -f "{{ install_marker }}"
+      - cmd: rtl8821au-install
+      - cmd: rtl8821au-reinstall
+      - service: rtl8821au-disable-tc2-agent
+
+rtl8821au-enable-tc2-hat-attiny:
+  service.running:
+    - name: tc2-hat-attiny
+    - enable: True
+    - require:
+      - cmd: rtl8821au-install
+      - cmd: rtl8821au-reinstall
+      - service: rtl8821au-disable-tc2-hat-attiny
+
 {% else %}
 rtl8821au-installed:
   test.nop:
     - name: rtl8821au
-    - comment: Driver already installed ({{ install_marker }})
+    - comment: Driver already installed (modinfo 8821au)
 {% endif %}
 
 rtl8821au-modprobe-options:

tc2/rtl8821au/map.jinja

@@ -41,7 +41,6 @@
 
 {% set branch = salt['pillar.get']('rtl8821au:branch', 'main') %}
 {% set source_dir = salt['pillar.get']('rtl8821au:source_dir', '/usr/local/src/8821au-20210708') %}
-{% set install_marker = salt['pillar.get']('rtl8821au:install_marker', source_dir ~ '/.salt-driver-installed') %}
 {% set auto_update = salt['pillar.get']('rtl8821au:auto_update', False) %}
 
 {% set rtl8821au = {
@@ -50,7 +49,6 @@
   'repo': salt['pillar.get']('rtl8821au:repo', 'https://github.com/morrownr/8821au-20210708.git'),
   'branch': branch,
   'source_dir': source_dir,
-  'install_marker': install_marker,
   'auto_update': auto_update,
   'install_args': salt['pillar.get']('rtl8821au:install_args', ['NoPrompt']),
 } %}

tc2/tc2-agent/init.sls

@@ -1,7 +1,7 @@
 tc2-agent-pkg:
   cacophony.pkg_installed_from_github:
     - name: tc2-agent
-    - version: "0.5.31"
+    - version: "0.6.0"
     - architecture: "arm64"
     - branch: "main"
 

tc2/tc2-hat-controller/init.sls

@@ -1,7 +1,7 @@
 tc2-hat-controller-pkg:
   cacophony.pkg_installed_from_github:
     - name: tc2-hat-controller
-    - version: "0.21.1"
+    - version: "0.22.0"
     - architecture: "arm64"
     - branch: "main"
 

tc2/thermal-recorder-py/thermal-classifier.service

@@ -5,7 +5,7 @@ After=multi-user.target
 [Service]
 Type=simple
 ExecStart=/home/pi/.venv/classifier/bin/serve_model
-Restart=always
+Restart=on-failure
 RestartSec=3s
 
 [Install]