Raspbian trixie

CHANGELOG.md

@@ -2,7 +2,9 @@
 
 # Future Release
 * System
+  * Upgrade from 32 bit raspbian Bookworm Desktop to 64 bit raspbian Trixie Lite
   * Upgraded volume calculations to preserve relative positions when hitting the min or max setting via source volume bar
+  * Added volume matching between AmpliPi and Spotify and vice-versa
   * Update our spotify provider `go-librespot` to `0.7.3`
   * Upgrade from Logitech Media Server 8.5.2 to Lyrion Music Server 9.0.3
   * Added in-place preamp recovery when I2C writes fail persistently

amplipi/app.py

@@ -972,7 +972,7 @@ async def get_response(self, path, scope):
 
 
 # Website
-app.mount('/', StaticFiles(directory=WEB_DIR, html=True), name='web')
+app.mount('/', CachelessFiles(directory=WEB_DIR, html=True), name='web')
 
 
 def create_app(mock_ctrl=None, mock_streams=None, config_file=None, delay_saves=None, settings: models.AppSettings = models.AppSettings()) -> FastAPI:

amplipi/auth.py

@@ -51,7 +51,7 @@
 # This is duplicated from amplipi.config intentionally. This file is pulled in
 # via the updater and we'd like to avoid as many external Amplipi dependencies in the updater
 # as possible.
-USER_CONFIG_DIR = os.path.join(os.path.expanduser('~'), '.config', 'amplipi')
+USER_CONFIG_DIR = os.path.join('/data', '.config', 'amplipi')
 
 USERS_FILE = os.path.join(USER_CONFIG_DIR, 'users.json')
 

amplipi/ctrl.py

@@ -852,15 +852,15 @@ def set_vol():
               vol, vol_f, vol_f_delta, vol_min, or vol_max.
           """
           # Field precedence: vol (db) > vol_delta > vol (float)
-          # vol (db) is first in precedence yet last in the stack to cover the default case of no volume change
+          # vol (db) is first in precedence yet last in the stack to cover the default case of a None volume change, but when it does have a value it overrides the other options
           if update.vol_delta_f is not None and update.vol is None:
             true_vol_f = zone.vol_f + zone.vol_f_overflow
             expected_vol_total = update.vol_delta_f + true_vol_f
             vol_f_new = utils.clamp(expected_vol_total, models.MIN_VOL_F, models.MAX_VOL_F)
 
             vol_db = utils.vol_float_to_db(vol_f_new, zone.vol_min, zone.vol_max)
             zone.vol_f_overflow = 0 if models.MIN_VOL_F < expected_vol_total and expected_vol_total < models.MAX_VOL_F \
-              else utils.clamp((expected_vol_total - vol_f_new), models.MIN_VOL_F_OVERFLOW, models.MAX_VOL_F_OVERFLOW)
+                else utils.clamp((expected_vol_total - vol_f_new), models.MIN_VOL_F_OVERFLOW, models.MAX_VOL_F_OVERFLOW)
             # Clamp the remaining delta to be between -1 and 1
 
           elif update.vol_f is not None and update.vol is None:

amplipi/defaults.py

@@ -14,7 +14,7 @@
 RCAs = [996, 997, 998, 999]
 LMS_DEFAULTS = [1000, 1001, 1002, 1003]
 
-USER_CONFIG_DIR = os.path.join(os.path.expanduser('~'), '.config', 'amplipi')
+USER_CONFIG_DIR = os.path.join('/data', '.config', 'amplipi')
 
 DEFAULT_CONFIG = {  # This is the system state response that will come back from the amplipi box
   "version": 1,

amplipi/display/check_pass

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/home/pi/.local/share/uv/python/cpython-3.8.20-linux-aarch64-gnu/bin/python3.8
 # This is a separate script as it must be run with root privileges
 # Example: sudo python check_pass 'raspberry'
 
@@ -9,5 +9,7 @@ import sys
 default_password = sys.argv[1]
 current_password = spwd.getspnam('pi').sp_pwd
 if crypt.crypt(default_password, current_password) == current_password:
+  print("Correct Password")
   sys.exit(0)
+print("Incorrect Password")
 sys.exit(1)

amplipi/display/common.py

@@ -75,7 +75,7 @@ class DefaultPass:
      the stored default AmpliPi password."""
 
   # Password config location
-  PASS_DIR = os.path.join(os.path.expanduser('~'), '.config', 'amplipi')
+  PASS_DIR = os.path.join('/data', '.config', 'amplipi')
   PASS_FILE = os.path.join(PASS_DIR, 'default_password.txt')
   DEFAULT_PI_PASSWORD = 'raspberry'
 
@@ -115,7 +115,7 @@ def get_default_pw(self) -> str:
   def check_pw(pw: str) -> bool:
     """ Check if the given password is the pi user's current password. """
     try:
-      subprocess.run(f'sudo python3 amplipi/display/check_pass {pw}', shell=True, check=True)
+      subprocess.run(f'sudo ./amplipi/display/check_pass {pw}', shell=True, check=True)
       return True
     except subprocess.CalledProcessError:
       return False
@@ -177,9 +177,9 @@ def get_zone_status(zone, sources) -> STATUS:
         else:
           return STATUS.PLAYING
       elif source_for_zone.state == 'stopped':
-          return STATUS.STOPPED
+        return STATUS.STOPPED
       elif source_for_zone.state == 'paused':
-          return STATUS.PAUSED
+        return STATUS.PAUSED
     return STATUS.IGNORE
   return STATUS.IGNORE
 
@@ -222,7 +222,7 @@ def get_emoji_status(url: str, max_length: int = 16) -> Union[str, int]:
 
   result = ''
   if status_counts[STATUS.PLAYING] > 0:
-      result += f'▶x{status_counts[STATUS.PLAYING]} '
+    result += f'▶x{status_counts[STATUS.PLAYING]} '
   if status_counts[STATUS.PAUSED] > 0:
     result += f'⏸x{status_counts[STATUS.PAUSED]} '
   if status_counts[STATUS.STOPPED] > 0:
@@ -248,7 +248,7 @@ def get_status(url: str, no_serial_ok: bool = False, emoji: bool = True, max_len
     result_status = st
 
   # Check if API is running
-  api_on = subprocess.run("systemctl --user is-active amplipi.service".split(), stdout=subprocess.DEVNULL)
+  api_on = subprocess.run("systemctl is-active amplipi.service".split(), stdout=subprocess.DEVNULL)
   if api_on.returncode != 0:
     return DisplayError.NO_AMPLIPI_SERVICE, None, 0
 

amplipi/rt.py

@@ -283,6 +283,10 @@ def _recover_preamps(self) -> bool:
     try:
       self.reset_preamps()
       self.set_i2c_addr()
+      try:
+        self.bus.close()
+      except Exception:
+        pass
       self.bus = SMBus(1)
       for addr, regs in list(self.preamps.items()):
         for reg, val in enumerate(regs):
@@ -319,6 +323,10 @@ def write_byte_data(self, preamp_addr, reg, data):
         # Fallback 1: reopen the bus handle and retry (transient bus glitch).
         try:
           time.sleep(0.001)
+          try:
+            self.bus.close()
+          except Exception:
+            pass
           self.bus = SMBus(1)
           self.bus.write_byte_data(preamp_addr, reg, data)
         except Exception: