update branch to latest dev

.gitignore

@@ -1,3 +1,5 @@
 /pillar
 top.sls
 /salt
+github_token.txt
+

_states/cacophony.py

@@ -3,7 +3,7 @@
 
 
 def pkg_installed_from_pypi(
-    name, version, pkg_name=None, venv=None, systemd_reload=True
+    name, version, pkg_name=None, venv=None, systemd_reload=True, branch=None
 ):
     """Install a pip package from a PYPI release
 
@@ -67,7 +67,7 @@ def pkg_installed_from_pypi(
 
 
 def pkg_installed_from_github(
-    name, version, pkg_name=None, systemd_reload=True, architecture="arm"
+    name, version, pkg_name=None, systemd_reload=True, architecture="arm", branch=None
 ):
     """Install a deb package from a Cacophony Project Github release if it
     isn't installed on the system already. Currently only ARM packages are

check-for-updates.py

@@ -0,0 +1,144 @@
+#!/bin/python
+
+import requests
+import os
+import yaml
+
+def get_latest_release(repo_url, headers):
+    response = requests.get(f"{repo_url}/releases/latest", headers=headers)
+    #print(f"Response status code for latest release: {response.status_code}")
+    #print(f"Response text for latest release: {response.text}")
+    response.raise_for_status()
+
+    if response.text:
+        try:
+            return response.json().get("tag_name")
+        except ValueError:
+            print("Error parsing JSON response for latest release.")
+            return None
+    else:
+        print("Empty response received for latest release.")
+        return None
+
+def get_main_commit(repo_url, headers, branch):
+    response = requests.get(f"{repo_url}/branches/{branch}", headers=headers)
+    response.raise_for_status()
+    return response.json()["commit"]["sha"]
+
+def check_release_up_to_date(repo_url, headers, branch="main"):
+    latest_release = get_latest_release(repo_url, headers)
+    if not latest_release:
+        return False
+    main_commit = get_main_commit(repo_url, headers, branch)
+    latest_release_commit = get_commit_sha(repo_url, latest_release, headers)
+    return main_commit == latest_release_commit
+
+def get_commit_sha(repo_url, tag, headers):
+    response = requests.get(f"{repo_url}/git/refs/tags/{tag}", headers=headers)
+    response.raise_for_status()
+    return response.json()["object"]["sha"]
+
+def read_salt_file(file_path):
+    with open(file_path, "r") as file:
+        return yaml.safe_load(file)
+
+def update_salt_file(salt_path, repo_name, latest_release):
+    salt_content = read_salt_file(salt_path)
+    updated = False
+
+    for key, value in salt_content.items():
+        if isinstance(value, dict) and 'cacophony.pkg_installed_from_github' in value:
+            for item in value['cacophony.pkg_installed_from_github']:
+                if isinstance(item, dict) and item.get('name') == repo_name and item.get('version') != latest_release:
+                    item['version'] = latest_release
+                    updated = True
+
+    if updated:
+        with open(salt_path, "w") as file:
+            yaml.dump(salt_content, file)
+        print(f"Updated Salt file at {salt_path} with release {latest_release}")
+    else:
+        print(f"Salt file at {salt_path} is already up to date with release {latest_release}")
+
+def find_sls_files(directory):
+    sls_files = []
+    for root, _, files in os.walk(directory):
+        for file in files:
+            if file.endswith(".sls"):
+                sls_files.append(os.path.join(root, file))
+    return sls_files
+
+def extract_repos_from_sls(sls_files):
+    repo_info = []
+
+    for sls_file in sls_files:
+        with open(sls_file, "r") as file:
+            content = yaml.safe_load(file)
+        for _, value in content.items():
+            if isinstance(value, dict) and 'cacophony.pkg_installed_from_github' in value:
+                data = value['cacophony.pkg_installed_from_github']
+                combine_data = {}
+                for i in data:
+                    combine_data = combine_data | i
+                data = combine_data
+                #print(data)
+                repo_info.append({
+                    "repo_name": data['name'],
+                    "version": "v"+data['version'],
+                    "salt_path": sls_file,
+                    "url": f"https://api.github.com/repos/TheCacophonyProject/{data['name']}",
+                    "branch": data.get('branch', None)
+                })
+    return repo_info
+
+def main():
+    # Check if there is a token file
+    if not os.path.exists("github_token.txt"):
+        print("No github_token.txt file found. Please create one with your Github token. No permissions are needed for the github token it is just used to stop from getting rate limited.")
+        return
+    # Read user token file
+    with open("github_token.txt", "r") as file:
+        token = file.read().strip()
+    headers = {"Authorization": f"token {token}"}
+    #headers = {}
+    sls_files = find_sls_files("./tc2")
+    repo_info = extract_repos_from_sls(sls_files)
+    print(f"Found {len(repo_info)} repos")
+
+
+    for repo in repo_info:
+        repo_url = repo["url"]
+        salt_path = repo["salt_path"]
+        repo_name = repo["repo_name"]
+        repo_version = repo["version"]
+        branch = "main"
+        if repo["branch"] is not None:
+            branch = repo["branch"]
+
+        try:
+            print(f"Checking {repo_name}...")
+
+            # Check that the latest release is up to date
+            is_up_to_date = check_release_up_to_date(repo_url, headers, branch)
+            if not is_up_to_date:
+                print(f"\tlatest release is not up to date with branch '{branch}'. Make a new release if needed.")
+                continue
+
+            # Check that the latest release is what is in the .sls file.
+            latest_release = get_latest_release(repo_url, headers)
+            if not latest_release:
+                print(f"\tFailed to get the latest release for {repo_url}")
+                continue            
+
+            if latest_release != repo_version:
+                print(f"\tlatest release is {latest_release} but {repo_version} is in the .sls file. Update the .sls file.")
+            else:
+                print(f"\tUp to date.")
+
+            #update_salt_file(salt_path, repo["repo_name"], latest_release)
+
+        except requests.exceptions.RequestException as e:
+            print(f"Error fetching data from {repo_url}: {e}")
+
+if __name__ == "__main__":
+    main()

tc2/basics/config.txt

@@ -28,6 +28,12 @@ arm_64bit=1
 # This leaves more RAM available for the CPU, at the cost of GPU performance.
 gpu_mem=16
 
+# Disable LEDs
+dtparam=act_led_trigger=none
+dtparam=act_led_activelow=off
+dtparam=pwr_led_trigger=none
+dtparam=pwr_led_activelow=off
+
 # Sets a pin low when the RPi has finished shutting down. The ATtiny will need to power off the 5V after this triggers,
 # failure to do so results in a kernel BUG, increased power consumption and undefined behaviour.
 # An unwanted behaviour is that when running a reboot command on the RPi it won't be able to reboot properly.

tc2/commands/upload-logs-2-days.sls

@@ -0,0 +1,9 @@
+upload_logs_2_days:
+  cmd.run:
+    - name: |
+        two_days_ago=$(date -d '2 days ago' +%Y-%m-%d)
+        log_file="/tmp/journalctl-logs-last-2-days.log"
+        journalctl --since "$two_days_ago" > "$log_file"
+        gzip -f "$log_file"
+        salt-call cp.push "$log_file.gz"
+    - shell: /bin/bash

tc2/device-register/init.sls

@@ -1,7 +1,8 @@
 device-register-pkg:
   cacophony.pkg_installed_from_github:
     - name: device-register
-    - version: "1.5.2"
+    - version: "1.5.3"
+    - branch: master
 
 /etc/systemd/system/device-register.service.d:
   file.directory

tc2/energy-savings/energy-savings

@@ -1,7 +1,15 @@
 #!/bin/bash
 
-# Power off HDMI
-/usr/bin/tvservice --off
+# Get the Raspberry Pi model and filter out null bytes
+MODEL=$(cat /proc/device-tree/model | tr -d '\0')
 
-# USB power will now be controlled by modemd
-#echo 0 | sudo tee /sys/devices/platform/soc/3f980000.usb/buspower
+if [[ "$MODEL" == *"Raspberry Pi Zero"* ]]; then
+    # If it is a Raspberry Pi Zero
+    echo 1 | sudo tee /sys/class/leds/ACT/brightness > /dev/null
+elif [[ "$MODEL" == *"Raspberry Pi 3"* ]]; then
+    # If it is a Raspberry Pi 3
+    echo 0 | sudo tee /sys/class/leds/ACT/brightness > /dev/null
+    echo 0 | sudo tee /sys/devices/platform/soc/3f980000.usb/buspower > /dev/null
+else
+    echo "Unsupported Raspberry Pi model."
+fi

tc2/energy-savings/init.sls

@@ -1,28 +1,22 @@
-#/usr/bin/energy-savings:
-#  file.managed:
-#    - source: salt://tc2/energy-savings/energy-savings
-#    - mode: 755
+/usr/bin/energy-savings:
+  file.managed:
+    - source: salt://tc2/energy-savings/energy-savings
+    - mode: 755
 
-#energy-savings-service-file:
-#  file.managed:
-#    - name: /etc/systemd/system/energy-savings.service
-#    - source: salt://tc2/energy-savings/energy-savings.service
-#    - mode: 644
+energy-savings-service-file:
+  file.managed:
+    - name: /etc/systemd/system/energy-savings.service
+    - source: salt://tc2/energy-savings/energy-savings.service
+    - mode: 644
 
-#energy-savings-daemon-reload:
-#  cmd.wait:
-#    - name: "systemctl daemon-reload"
-#    - watch:
-#      - energy-savings-service-file
+energy-savings-daemon-reload:
+  cmd.wait:
+    - name: "systemctl daemon-reload"
+    - watch:
+      - energy-savings-service-file
 
-#energy-savings-service:
-#  service.enabled:
-#    - name: energy-savings
-#    - watch:
-#      - energy-savings-daemon-reload
-
-#/etc/systemd/system/basic.target.wants/hdmi-off.service:
-#   file.absent
-
-#/etc/systemd/system/hdmi-off.service:
-#   file.absent
+energy-savings-service:
+  service.enabled:
+    - name: energy-savings
+    - watch:
+      - energy-savings-daemon-reload

tc2/event-reporter/init.sls

@@ -1,7 +1,8 @@
 event-reporter-pkg:
   cacophony.pkg_installed_from_github:
     - name: event-reporter
-    - version: "3.7.0"
+    - version: "3.8.0"
+    - branch: "master"
 
 event-reporter-service:
   service.running:

tc2/management-interface/init.sls

@@ -1,7 +1,8 @@
 management-interface-pkg:
   cacophony.pkg_installed_from_github:
     - name: management-interface
-    - version: "1.24.3-tc2"
+    - version: "1.29.1-tc2"
+    - branch: tc2
 
 managementd-service:
   service.running:

tc2/modemd/init.sls

@@ -11,6 +11,7 @@ modemd-pkg:
   cacophony.pkg_installed_from_github:
     - name: modemd
     - version: "1.9.1-tc2"
+    - branch: "tc2"
 
 modemd:
   service.running:

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.5.2"
+    - version: "0.5.3"
     - architecture: "arm64"
 
 rpi-net-manager-service:

tc2/salt-updater/init.sls

@@ -5,7 +5,7 @@
 salt-updater-pkg:
   cacophony.pkg_installed_from_github:
     - name: salt-updater
-    - version: "0.7.1"
+    - version: "0.8.3"
 
 salt-updater:
   service.running:

tc2/tc2-agent/init.sls

@@ -1,8 +1,9 @@
 tc2-agent-pkg:
   cacophony.pkg_installed_from_github:
     - name: tc2-agent
-    - version: "0.1.22"
-    - architecture: "armhf"
+    - version: "0.3.10"
+    - architecture: "arm64"
+    - branch: "main"
 
 tc2-agnet-service:
   service.running:

tc2/tc2-hat-controller/init.sls

@@ -1,15 +1,31 @@
 tc2-hat-controller-pkg:
   cacophony.pkg_installed_from_github:
     - name: tc2-hat-controller
-    - version: "0.7.0"
+    - version: "0.11.1"
     - architecture: "arm64"
+    - branch: "main"
 
 tc2-hat-attiny-service:
   service.running:
     - name: tc2-hat-attiny
     - enable: True
 
+tc2-hat-i2c-service:
+  service.running:
+    - name: tc2-hat-i2c
+    - enable: True
+
 tc2-hat-temp-service:
   service.running:
-    - name: tc2-hat-attiny
+    - name: tc2-hat-temp
     - enable: True
+
+tc2-hat-rtc-service:
+  service.running:
+    - name: tc2-hat-rtc
+    - enable: True
+
+#tc2-hat-uart-service:
+#  service.running:
+#    - name: tc2-hat-uart
+#    - enable: True

tc2/thermal-recorder-py/init.sls

@@ -37,7 +37,7 @@ classifier-env:
 classifier-pipeline-pip:
   cacophony.pkg_installed_from_pypi:
     - name: classifier-pipeline
-    - version: "0.0.9"
+    - version: "0.0.15"
     - venv: /home/pi/.venv/classifier/bin/
 
 thermal-recorder-py-service:

tc2/thermal-uploader/init.sls

@@ -1,7 +1,8 @@
 thermal-uploader-pkg:
   cacophony.pkg_installed_from_github:
     - name: thermal-uploader
-    - version: "2.3.0"
+    - version: "2.6.2"
+    - branch: master
 
 thermal-uploader-service:
   service.running: