Make sure hardware clock (external RTC) is set when setting time; when checking if SSD is; also check if it is correctly mounted; remove amber from version naming

Author: JonasBchrt

_version.py

@@ -1 +1 @@
-__version__ = "amber-kenya-0.0.1"
+__version__ = "ami-cellular-0.0.3"

amitrap.py

@@ -258,15 +258,23 @@ def get_memory_info(self):
 
     def _is_ssd_connected(self):
         """
-        Checks if a drive is connected.
+        Checks if an SSD is connected and mounted at /media/pi/PiImages.
 
         Returns:
-            bool: True if at least one drive is connected, False otherwise.
+            bool: True if /dev/sda is connected and mounted at /media/pi/PiImages, False otherwise.
         """
-        output = subprocess.check_output(['lsblk', '-o', 'NAME,TYPE']) 
-        # Decode the output from bytes to string 
-        output = output.decode('utf-8') 
-        return "sda" in output
+        try:
+            # Check if /dev/sda is mounted at /media/pi/PiImages
+            output = subprocess.check_output(['lsblk', '-o', 'NAME,MOUNTPOINT'], text=True)
+            
+            for line in output.splitlines():
+                if "sda" in line and "/media/pi/PiImages" in line:
+                    return True
+            
+            return False
+        
+        except subprocess.CalledProcessError:
+            return False
 
     def get_bluetooth_info(self):
         """
@@ -405,6 +413,17 @@ def set_time(self, time=None, zone=None):
                 print("Could not set RTC time. Is there an issue with the WittyPi?")
                 print()
 
+        try:
+            # Set system time from RTC
+            bash_cmd = f"sudo hwclock -w"
+            print(bash_cmd)
+            print()
+            subprocess.run(bash_cmd, check=True, shell=True, timeout=2)
+        except Exception as e:
+            print(e)
+            print("Could not set RTC time. Is there an issue with the DS3231? Ignore if you are not using a DS3231.")
+            print()
+
     def get_serial_number(self):
         """
         Gets the serial number of the Raspberry Pi / Rock Pi.

amitrap_cellular.py

@@ -41,7 +41,7 @@ async def cellular_configure(i2c_path="/dev/i2c-1"):
     """
 
     # Notehub (cloud) project unique identifier
-    productUID = "todo:replace-with-your-product-uid"
+    #productUID = "todo:replace-with-your-product-uid"
 
     # Synchronization mode
     # Must be one of 'periodic', 'continous', 'minimum', 'off', or 'dfu'
@@ -60,7 +60,7 @@ async def cellular_configure(i2c_path="/dev/i2c-1"):
     print()
     # Configure cellular module (Notecard)
     hub.set(nCard,
-            product=productUID,
+            #product=productUID,
             mode=sync_mode,
             outbound=outbound_interval_minutes,
             inbound=inbound_interval_minutes)