diff --git a/packages/omamobile-modem-sit/lib/bringup.py b/packages/omamobile-modem-sit/lib/bringup.py index b3692a770..306fec719 100644 --- a/packages/omamobile-modem-sit/lib/bringup.py +++ b/packages/omamobile-modem-sit/lib/bringup.py @@ -430,7 +430,15 @@ def usim_ready(): provision_profiles(client, profiles) lte = net.get('nr', 'off') == 'off' nr_after_radio = False - if lte and not already_on and net.getboolean('nr_after_radio_on', False): + try: + after_on = net.getboolean('nr_after_radio_on', False) + except ValueError: + # A mistyped value keeps today's order rather than stopping the + # start after the attach settings were sent. + print(f"nr_after_radio_on = {net.get('nr_after_radio_on')!r} isn't yes or no; " + 'the NR mode is set as by default', flush=True) + after_on = False + if lte and not already_on and after_on: # [network] nr_after_radio_on = yes: never with the radio off. On a # second Pixel 7 Pro this modem sometimes accepted SET_NR_MODE with # the radio off (reading 0) instead of refusing it, put the mode back diff --git a/packages/omamobile-modem-sit/test/test_bringup.py b/packages/omamobile-modem-sit/test/test_bringup.py index e55bec81c..91683279b 100644 --- a/packages/omamobile-modem-sit/test/test_bringup.py +++ b/packages/omamobile-modem-sit/test/test_bringup.py @@ -369,6 +369,14 @@ def test_nr_after_radio_on_never_sets_it_with_the_radio_off(self): order, _ = self.run_start(1, settings) self.assertEqual(order[:5], ['state', 'attach', 'profiles', 'nr', 'reg']) + def test_nr_after_radio_on_mistyped_keeps_the_default_order(self): + settings = paths.config('/nonexistent') + settings['network']['apn'] = 'internet.example' + settings['network']['nr_after_radio_on'] = 'ja' + order, lines = self.run_start(0, settings) + self.assertEqual(order[:6], ['state', 'attach', 'profiles', 'nr', 'on', 'reg']) + self.assertTrue(any("'ja' isn't yes or no" in l for l in lines)) + def test_nr_on_leaves_the_nr_mode_alone(self): settings = paths.config('/nonexistent') settings['network']['apn'] = 'internet.example' diff --git a/packages/omamobile-modem-sit/version b/packages/omamobile-modem-sit/version index a02af2417..b463c010a 100644 --- a/packages/omamobile-modem-sit/version +++ b/packages/omamobile-modem-sit/version @@ -1 +1 @@ -0.3.40 +0.3.41