colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

eg25-control: allow finer-grained service control

Browse Source
This commit is contained in:
Colin
2023-09-15 01:38:50 +00:00
parent 649e5a2cab
commit a0c2ed38e6
2 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/services/eg25-control.nix
View File

@@ -12,15 +12,35 @@ in
};
config = lib.mkIf cfg.enable {
systemd.services.eg25-control = {
systemd.services.eg25-control-powered = {
description = "power to the Qualcomm eg25 modem used by PinePhone";
serviceConfig = {
Type = "simple";
ExecStart = "${cfg.package}/bin/eg25-control --power-on --enable-gps --dump-debug-info --verbose";
RemainAfterExit = true;
ExecStart = "${cfg.package}/bin/eg25-control --power-on --verbose";
ExecStop = "${cfg.package}/bin/eg25-control --power-off --verbose";
Restart = "on-failure";
RestartSec = "60s";
};
after = [ "ModemManager.service" ];
wants = [ "ModemManager.service" ];
# wantedBy = [ "multi-user.target" ];
};
systemd.services.eg25-control-gps = {
# TODO: separate almanac upload from GPS enablement
# - don't want to re-upload the almanac everytime the GPS is toggled
# - want to upload almanac even when GPS *isn't* enabled, if we have internet connection.
description = "background GPS tracking";
serviceConfig = {
Type = "simple";
RemainAfterExit = true;
ExecStart = "${cfg.package}/bin/eg25-control --enable-gps --dump-debug-info --verbose";
ExecStop = "${cfg.package}/bin/eg25-control --disable-gps --dump-debug-info --verbose";
Restart = "on-failure";
RestartSec = "60s";
};
after = [ "eg25-control-powered.service" ];
requires = [ "eg25-control-powered.service" ];
wantedBy = [ "multi-user.target" ];
};
};

19
pkgs/additional/eg25-control/eg25-control
View File

@@ -285,6 +285,13 @@ class Sequencer:
logger.info("modem hasn't appeared: sleeping for 1s")
time.sleep(1) # wait for modem to appear
@log_scope("halting modem...", "modem halted")
def power_off(self) -> None:
self.executor.write_file(self.power_endpoint, b'0')
while self._try_mmcli([]):
logger.info("modem still powered: sleeping for 1s")
time.sleep(1) # wait for modem to disappear
def at_check(self) -> None:
""" sanity check that the modem is listening for AT commands and responding reasonably """
hw = self._at_cmd("QGMR")
@@ -375,6 +382,10 @@ class Sequencer:
# TODO: tune/document these QGPS values; a smarter setting here might reduce jitter?
self._at_structured_cmd("QGPS", value="1,255,1000,0,1")
@log_scope("halting gps...", "gps halted")
def disable_gps(self) -> None:
self._at_structured_cmd("QGPSEND", check=False)
@log_scope("configuring powersave...", "powersave configured")
def enable_powersave(self) -> None:
# Allow sleeping for power saving
@@ -405,6 +416,8 @@ def main():
parser.add_argument('--enable-urc', action='store_true', help="enable support for Unsolicited Return Codes (?)")
parser.add_argument('--enable-gps', action='store_true', help="enable the GPS and acquire tracking until asked to stop")
parser.add_argument('--enable-powersave', action='store_true', help="configure modem to sleep when possible")
parser.add_argument('--disable-gps', action='store_true', help="disable the GPS and stop any tracking")
parser.add_argument('--power-off', action='store_true', help="disable power to the modem")
parser.add_argument('--dump-debug-info', action='store_true', help="don't initialize anything, just dump debugging data")
args = parser.parse_args()
@@ -424,6 +437,12 @@ def main():
sequencer.enable_gps()
if args.enable_powersave:
sequencer.enable_powersave()
if args.disable_gps:
sequencer.disable_gps()
if args.power_off:
sequencer.power_off()
if args.dump_debug_info:
sequencer.dump_debug_info()