Add a feature to camera control, so that "noon" can be used as a sentinal value which will calculate the local solar noon in camera time

Tests/RebootAtNoonTesting.py

@@ -0,0 +1,131 @@
+import os.path
+import json
+import RMS.Misc
+import unittest
+import datetime
+import re
+import dvrip as dvr
+import subprocess
+import pickle
+
+process_pickle_only = False
+
+def readFileAsLines(file_path="~/source/RMS/.config"):
+
+    with open(os.path.expanduser(file_path), 'r') as file:
+        line_list =  file.readlines()
+
+    file_as_lines_list, stripped_line = [], ""
+    for line in line_list:
+        stripped_line = line.strip().replace("\n","")
+        file_as_lines_list.append(stripped_line)
+
+    return file_as_lines_list
+
+def writeFileFromLines(lines_list, file_path="~/source/RMS/.config"):
+
+    with open(os.path.expanduser(file_path), 'w') as file:
+
+        for line in lines_list:
+            file.write("{}\n".format(line))
+        file.flush()
+
+
+
+def getValue(lines_list,section, key):
+
+    this_section, output_line_list = None, []
+    for line in lines_list:
+        if line.strip().startswith("[") and line.strip().endswith("]"):
+             this_section =  line.replace("[","").replace("]","").strip()
+
+        if this_section == section and line.startswith("{}:".format(key)):
+            value = line[len(key)+1:].strip()
+
+    return value
+
+
+
+def setValue(lines_list, section, key, value):
+
+    this_section, output_line_list = None, []
+    for line in lines_list:
+        if line.strip().startswith("[") and line.strip().endswith("]"):
+             this_section =  line.replace("[","").replace("]","").strip()
+
+        if this_section == section and line.startswith("{}:".format(key)):
+            line = "{}: {}".format(key, value)
+        output_line_list.append(line)
+    return output_line_list
+
+class TestRebootAtNoon(unittest.TestCase):
+
+    def test_RebootAtNoon(self):
+
+        config_file = readFileAsLines()
+        rms_data_path = os.path.expanduser(getValue(config_file, "Capture", "data_dir"))
+
+        if not process_pickle_only:
+            camera_ip = re.findall(r"[0-9]+(?:\.[0-9]+){3}", getValue(config_file, "Capture", "device"))[0]
+            cam = dvr.DVRIPCam(camera_ip)
+
+            if cam.login():
+
+                print("Logged in to {}".format(camera_ip))
+                # Store the station longitude setting
+                station_longitude = getValue(config_file, "System", "longitude")
+                test_data = []
+                for test_longitude in range(-360, 360, 10):
+                    writeFileFromLines(setValue(config_file, "System", "longitude", test_longitude))
+                    for test_hour in range(0, 23):
+                        for test_minute in range(0,60,15):
+                            real_time = datetime.datetime.now(tz=datetime.timezone.utc).replace(tzinfo=None)
+                            test_time_python_object = real_time.replace(hour=test_hour, minute=test_minute, second=0, microsecond=0)
+                            print("Testing at longitude: {} and time:{}".format(test_longitude, test_time_python_object))
+                            cam.set_time(test_time_python_object)
+                            camera_time = cam.get_time()
+                            print("Camera set to {}".format(camera_time))
+                            result = subprocess.run(['python','-m','Utils.CameraControl','SetAutoReboot','Everyday,noon'], capture_output=True, text=True)
+                            print("Command feedback was {}".format(result))
+                            reboot_hour_read_back = cam.get_info("General.AutoMaintain")['AutoRebootHour']
+                            print("Reboot time read back as {}".format(reboot_hour_read_back))
+                            test_data.append([test_longitude,real_time,camera_time,reboot_hour_read_back])
+                with open(os.path.join(rms_data_path,"reboot_at_noon_test.pkl"), 'wb') as f:
+                    pickle.dump(test_data, f)
+
+            # Put the station longitude back
+                writeFileFromLines(setValue(config_file, "System", "longitude", station_longitude))
+
+        with open(os.path.join(rms_data_path, "reboot_at_noon_test.pkl"), 'rb') as f:
+            test_data_list = pickle.load(f)
+        output_data = []
+        max_divergence = 0
+        output_data.append(
+            "Longitude | Longitude wrapped | Local noon | Test time | Camera time | Camera time ahead (hrs) | Noon in camera time | Camera reboot time | Divergence |\n")
+        for test_data in test_data_list:
+            longitude, test_time_utc, camera_time, reboot_hour_read_back = test_data
+            longitude_wrapped = (longitude + 180) % 360 - 180
+
+
+
+
+            local_noon_utc = 12 - 24 * longitude_wrapped / 360
+            camera_time_offset_from_utc_hours = (camera_time - test_time_utc).total_seconds() / 3600
+            noon_in_camera_time = (local_noon_utc + camera_time_offset_from_utc_hours) % 24
+            divergence_hrs = round(min(noon_in_camera_time - reboot_hour_read_back, reboot_hour_read_back, noon_in_camera_time),1)
+            output_data.append("{:>9} |{:>18} | {:>10} | {:>5}  | {:>5}    | {:>23} | {:>19} | {:>18} | {:>10} |\n".format(longitude, longitude_wrapped,
+                                    round(local_noon_utc,1), test_time_utc.strftime("%H:%M:%S"),
+                                    camera_time.strftime("%H:%M:%S"), round(camera_time_offset_from_utc_hours,1),
+                                    round(noon_in_camera_time,1), reboot_hour_read_back, divergence_hrs))
+
+            pass
+
+            self.assertLess (divergence_hrs, 2 )
+
+        with open(os.path.join(rms_data_path, "reboot_at_noon_test.txt"), 'w') as f:
+            f.writelines(output_data)
+            f.flush()
+
+if __name__ == '__main__':
+
+    unittest.main()

Utils/CameraControl.py

@@ -397,6 +397,20 @@ def setNetworkParam(cam, opts):
 
     elif fld == 'setTimezone':
         val = opts[2]
+        data_dict = cam.get_info("NetWork.NetNTP")
+        print("Data dict: {}".format(data_dict))
+        existing_timezone = data_dict.get('TimeZone')
+        print("Existing timezone: {}".format(existing_timezone))
+        if existing_timezone is not None:
+            if existing_timezone != val:
+                reboot_time = cam.get_info("General.AutoMaintain")['AutoRebootHour']
+                reboot_day = cam.get_info("General.AutoMaintain")['AutoRebootDay']
+                timezone_change = int(val) - existing_timezone
+                reboot_time_compensated = reboot_time - timezone_change
+                log.info('Setting timezone to {}'.format(val))
+                log.info('Consider adjusting camera reboot time of {} to {} using command :'.format(reboot_time, reboot_time_compensated))
+                log.info('  python -m Utils.CameraControl SetAutoReboot {},{}'.format(reboot_day, reboot_time_compensated))
+
         cam.set_info("NetWork.NetNTP.TimeZone", val)
 
     elif fld == 'EnableNTP':
@@ -590,23 +604,36 @@ def setAutoReboot(cam, opts):
     info = cam.get_info("General.AutoMaintain") 
     # print(json.dumps(info, ensure_ascii=False, indent=4, sort_keys=True))
     if len(opts) < 1:
-        log.info('usage: setAutoReboot dayofweek,hour')
+        log.info('usage: SetAutoReboot dayofweek,hour')
         log.info('  where dayofweek is Never EveryDay Monday Tuesday etc')
-        log.info('  and hour is a number between 0 and 23')
+        log.info('  and hour is a number between 0 and 23 or "noon" for station solar noon')
         return
     spls = opts[0].split(',')
     day = spls[0]
     hour = 0
     if len(spls) > 1:
-        hour = int(spls[1])
+        hour = spls[1]
     valid_days = [
         'Everyday','Monday','Tuesday','Wednesday','Thursday','Friday',
         'Saturday','Sunday','Never'
     ]
+
+    if hour == "noon":
+        camera_time_offset = computeCameraTimeOffset(cam)
+        if camera_time_offset is None:
+            log.warning("Unable to retrieve camera time, aborting")
+            return
+        # compute station noon from longitude, and wrap to 24 hour window
+        station_noon_in_utc = int(12 - config.longitude / 15) % 24
+        station_noon_in_machine_time = station_noon_in_utc + camera_time_offset
+        hour = round(station_noon_in_machine_time,0) % 24
+
+    hour = int(hour)
+
     if day not in valid_days or hour < 0 or hour > 23:
         log.info('usage: SetAutoReboot dayofweek,hour')
         log.info('  where dayofweek is Never, Everyday, Monday, Tuesday, Wednesday etc')
-        log.info('  and hour is a number between 0 and 23')
+        log.info('  and hour is a number between 0 and 23 or "noon" for station solar noon')
         return
 
     info["AutoRebootDay"] = day
@@ -781,6 +808,30 @@ def dvripCall(cam, cmd, opts, camera_settings_path='./camera_settings.json'):
                     reqtime = datetime.datetime.strptime(opts[1], '%Y%m%d_%H%M%S')
                 except:
                     reqtime = datetime.datetime.now()
+                time_before_adjustment = datetime.datetime.strptime(str(cam.get_time()), '%Y-%m-%d %H:%M:%S')
+                time_increment_hrs = (reqtime - time_before_adjustment).total_seconds() / 3600
+
+                if abs(time_increment_hrs) > 1:
+                    reboot_time = cam.get_info("General.AutoMaintain")['AutoRebootHour']
+                    reboot_day = cam.get_info("General.AutoMaintain")['AutoRebootDay']
+                    reboot_time_compensated = round(reboot_time - time_increment_hrs) % 24
+                    if time_increment_hrs > 0:
+
+                        if round(time_increment_hrs,2) != 1:
+                            log.info("Moving camera clock forwards by {} hours.".format(round(time_increment_hrs,2)))
+                        else:
+                            log.info("Moving camera clock forwards by {} hour.".format(round(time_increment_hrs, 2)))
+                    else:
+
+                        if round(time_increment_hrs,2) != 1:
+                            log.info("Moving camera clock backwards by {} hours.".format(round(time_increment_hrs,2)))
+                        else:
+                            log.info("Moving camera clock backwards by {} hour.".format(round(time_increment_hrs, 2)))
+                    if reboot_time != reboot_time_compensated:
+                        sleep(0.1) # Needed to make the logs get written in the correct order
+                        log.info("Reboot time is hour {}, consider setting to hour {} using command: ".format(reboot_time,reboot_time_compensated))
+                        log.info("  python -m Utils.CameraControl SetAutoReboot {},{}".format(reboot_day, reboot_time_compensated))
+
                 cam.set_time(reqtime)
                 log.info('time set to %s', reqtime)
         else:
@@ -859,6 +910,25 @@ def cameraControlV2(config, cmd, opts=''):
 
     cameraControl(camera_ip, cmd, opts, camera_settings_path=camera_settings_path)
 
+def computeCameraTimeOffset(cam):
+    """
+    Compute camera time offset.
+
+    Returns:
+        Time offset of camera relative to UTC in hours. If the call fails, return None
+    """
+
+    utc_time_naive = datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None)
+    try:
+        camera_time_naive = datetime.datetime.strptime(str(cam.get_time()), "%Y-%m-%d %H:%M:%S")
+    except:
+        camera_time_naive = None
+        return None
+
+    camera_time_offset = round((camera_time_naive - utc_time_naive).total_seconds() / 3600,2)
+
+    # wrap to +/- 12
+    return ((camera_time_offset + 12) % 24) - 12
 
 if __name__ == '__main__':
     """Main function
@@ -867,6 +937,8 @@ def cameraControlV2(config, cmd, opts=''):
         opts - optional list of fields and a value to pass to SetParam
     """
 
+
+
     # list of supported commands
     cmd_list = [
         'reboot', 'GetHostname', 'GetSettings','GetDeviceInformation','GetNetConfig',
@@ -923,6 +995,8 @@ def cameraControlV2(config, cmd, opts=''):
     log = getLogger("logger")
 
 
+
+
     if cmd not in cmd_list:
         log.info('Error: command "%s" not supported', cmd)
         exit(1)

camera_settings.json

@@ -2,7 +2,6 @@
   "init": [
     ["SetOSD", "off"],
     ["SetColor", "100,50,50,50,0,0"],
-    ["SetAutoReboot", "Everyday,15"],
     ["CameraTime", "set"],
     ["CloudConnection", "off"],
     ["SetParam", "Network", "TransferPlan", "Fluency"],
@@ -48,6 +47,7 @@
 
   "day": [
     ["CameraTime", "set"],
+    ["SetAutoReboot", "Everyday,noon"],
     ["SetParam", "Camera", "DayNightColor", "1"],
     ["SetParam", "Camera", "ElecLevel", "50"],
     ["SetParam", "Camera", "BroadTrends", "AutoGain", "1"],
@@ -58,6 +58,7 @@
 
   "night": [
     ["CameraTime", "set"],
+    ["SetAutoReboot", "Everyday,noon"],
     ["SetParam", "Camera", "DayNightColor", "2"],
     ["SetParam", "Camera", "ElecLevel", "60"],
     ["SetParam", "Camera", "BroadTrends", "AutoGain", "0"],