Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions python/PiFinder/ui/callbacks.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,11 @@ def set_exposure(ui_module: UIModule) -> None:
ui_module.command_queues["camera"].put(f"set_exp:{new_exposure}")


def apply_brightness(ui_module: UIModule) -> None:
"""Re-apply display + keypad brightness from current config."""
ui_module.command_queues["ui_queue"].put("set_brightness")


def set_auto_exposure_zero_star_handler(ui_module: UIModule) -> None:
"""
Sets the zero-star handler plugin for auto-exposure.
Expand Down
1 change: 1 addition & 0 deletions python/PiFinder/ui/menu_structure.py
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,7 @@ def _(key: str) -> Any:
"class": UITextMenu,
"select": "single",
"config_option": "keypad_brightness",
"post_callback": callbacks.apply_brightness,
"items": [
{
"name": "-4",
Expand Down
182 changes: 3 additions & 179 deletions python/PiFinder/ui/status.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,72 +22,9 @@ class UIStatus(UIModule):

__title__ = "STATUS"

_config_options = {
"Key Brit": {
"type": "enum",
"value": "",
"options": ["+3", "+2", "+1", "0", "-1", "-2", "-3", "Off"],
"callback": "set_key_brightness",
},
"Sleep Tim": {
"type": "enum",
"value": "",
"options": ["Off", "10s", "30s", "1m"],
"callback": "set_sleep_timeout",
},
"Screen Off": {
"type": "enum",
"value": "",
"options": ["Off", "30s", "1m", "10m", "30m"],
"callback": "set_screen_off_timeout",
},
"Hint Time": {
"type": "enum",
"value": "2s",
"options": ["Off", "2s", "4s", "On"],
"callback": "set_hint_timeout",
},
"WiFi Mode": {
"type": "enum",
"value": "UNK",
"options": ["AP", "Client", "CANCEL"],
"callback": "wifi_switch",
},
"Mnt Side": {
"type": "enum",
"value": "",
"options": ["right", "left", "flat", "CANCEL"],
"callback": "side_switch",
},
"Mnt Type": {
"type": "enum",
"value": "",
"options": ["Alt/Az", "EQ", "CANCEL"],
"callback": "mount_switch",
},
"Shutdown": {
"type": "enum",
"value": "",
"options": ["System", "CANCEL"],
"callback": "shutdown",
},
"Software": {
"type": "enum",
"value": "",
"options": ["Update", "CANCEL"],
"callback": "update_software",
},
}

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.version_txt = f"{utils.pifinder_dir}/version.txt"
self.wifi_txt = f"{utils.pifinder_dir}/wifi_status.txt"
self._draw_pos = (0, self.display_class.titlebar_height)
with open(self.wifi_txt, "r") as wfs:
self._config_options["WiFi Mode"]["value"] = wfs.read()
with open(self.version_txt, "r") as ver:
self._config_options["Software"]["value"] = ver.read()
self.spacecalc = SpaceCalculatorFixed(self.fonts.base.line_length)
self.status_dict = {
"LAST SLV": "--",
Expand All @@ -107,29 +44,9 @@ def __init__(self, *args, **kwargs):
"CPU TMP": "--",
}

if self._config_options["WiFi Mode"]["value"] == "Client":
self.status_dict["WIFI"] = "Client"
else:
self.status_dict["WIFI"] = "AP"

self._config_options["Mnt Type"]["value"] = self.config_object.get_option(
"mount_type"
)
self._config_options["Mnt Side"]["value"] = self.config_object.get_option(
"screen_direction"
)
self._config_options["Sleep Tim"]["value"] = self.config_object.get_option(
"sleep_timeout"
)
self._config_options["Screen Off"]["value"] = self.config_object.get_option(
"screen_off_timeout"
)
self._config_options["Hint Time"]["value"] = self.config_object.get_option(
"hint_timeout"
)
self._config_options["Key Brit"]["value"] = self.config_object.get_option(
"keypad_brightness"
)
with open(f"{utils.pifinder_dir}/wifi_status.txt", "r") as wfs:
wifi_mode = wfs.read()
self.status_dict["WIFI"] = "Client" if wifi_mode == "Client" else "AP"

self.last_temp_time = 0
self.last_IP_time = 0
Expand All @@ -143,91 +60,6 @@ def __init__(self, *args, **kwargs):
available_lines=9,
)

def update_software(self, option):
if option == "CANCEL":
with open(self.version_txt, "r") as ver:
self._config_options["Software"]["value"] = ver.read()
return False

self.message("Updating...", 10)
if sys_utils.update_software():
self.message("Ok! Restarting", 10)
sys_utils.restart_pifinder()
else:
self.message("Error on Upd", 3)

def set_key_brightness(self, option):
self.command_queues["ui_queue"].put("set_brightness")
self.config_object.set_option("keypad_brightness", option)
return False

def set_sleep_timeout(self, option):
self.config_object.set_option("sleep_timeout", option)
return False

def set_hint_timeout(self, option):
self.config_object.set_option("hint_timeout", option)
self.ui_state.set_hint_timeout(option)
return False

def set_screen_off_timeout(self, option):
self.config_object.set_option("screen_off_timeout", option)
return False

def mount_switch(self, option):
if option == "CANCEL":
self._config_options["Mnt Type"]["value"] = self.config_object.get_option(
"mount_type"
)
return False

self.message("Ok! Restarting", 10)
self.config_object.set_option("mount_type", option)
sys_utils.restart_pifinder()

def side_switch(self, option):
if option == "CANCEL":
self._config_options["Mnt Side"]["value"] = self.config_object.get_option(
"screen_direction"
)
return False

self.message("Ok! Restarting", 10)
self.config_object.set_option("screen_direction", option)
sys_utils.restart_pifinder()

def wifi_switch(self, option):
with open(self.wifi_txt, "r") as wfs:
current_state = wfs.read()
if option == current_state or option == "CANCEL":
self._config_options["WiFi Mode"]["value"] = current_state
return False

if option == "AP":
self.message("Switch to AP", 10)
sys_utils.go_wifi_ap()
else:
self.message("Switch to Client", 10)
sys_utils.go_wifi_cli()

sys_utils.restart_system()

def shutdown(self, option):
if option == "System":
self.message("Shutting down", 10)
sys_utils.shutdown()
else:
self._config_options["Shutdown"]["value"] = ""
return False

def restart(self, option):
if option == "PiFi":
self.message("Restarting", 10)
sys_utils.restart_pifinder()
else:
self._config_options["Restart"]["value"] = ""
return False

def update_status_dict(self):
"""
Updates all the status dict values
Expand Down Expand Up @@ -354,11 +186,3 @@ def key_up(self):

def key_down(self):
self.text_layout.next()

def active(self):
"""
Called when a module becomes active
i.e. foreground controlling display
"""
with open(self.wifi_txt, "r") as wfs:
self._config_options["WiFi Mode"]["value"] = wfs.read()
Loading