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 packages/omamobile-modem-sit/etc/omamobile/modem-sit.conf
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@ carrier_manifest_timeout = 60
# in RAM), set before the radio is switched on. On this phone NR registered
# but carried no traffic. "on" leaves the modem's own setting alone.
nr = off
# nr_after_radio_on = yes sets that NR mode only right after radio on, never
# with the radio off: for a modem that sometimes takes it with the radio off
# and then never registers (packet state 20). Off: before radio on, and
# after it only when the modem refuses it then.
nr_after_radio_on = no
# Seconds to wait for the SIM, then for packet registration.
sim_timeout = 120
register_timeout = 180
Expand Down
13 changes: 12 additions & 1 deletion packages/omamobile-modem-sit/lib/bringup.py
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,18 @@ def usim_ready():
provision_profiles(client, profiles)
lte = net.get('nr', 'off') == 'off'
nr_after_radio = False
if lte:
if lte and not already_on and net.getboolean('nr_after_radio_on', False):
# [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
# to 1 itself at radio on, and never reported packet registration
# (state 20) until the deadline: a race with sitd's start-up speed,
# in every boot there once energy-aware scheduling ran sitd on the
# little cores. Set right after radio on, it held. Off by default:
# the reference 7 Pro registers with the order below.
nr_after_radio = True
print('NR mode: set right after radio on (nr_after_radio_on)', flush=True)
elif lte:
# Before radio on, as stock sets its network type: changed after
# registration it made the CP register again. This modem refuses
# SET_NR_MODE with the radio off (error 2, 2026-11-02), so then it is
Expand Down
11 changes: 11 additions & 0 deletions packages/omamobile-modem-sit/test/test_bringup.py
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,17 @@ def test_unreadable_state_falls_back_to_the_old_cycle(self):
self.assertEqual(order[:6], ['state', 'off', 'attach', 'profiles', 'nr', 'on'])
self.assertTrue(any('radio state unreadable' in l for l in lines))

def test_nr_after_radio_on_never_sets_it_with_the_radio_off(self):
settings = paths.config('/nonexistent')
settings['network']['apn'] = 'internet.example'
settings['network']['nr_after_radio_on'] = 'yes'
order, lines = self.run_start(0, settings)
self.assertEqual(order[:6], ['state', 'attach', 'profiles', 'on', 'nr', 'reg'])
self.assertTrue(any('nr_after_radio_on' in l for l in lines))
# With the radio already on it is set as before, once.
order, _ = self.run_start(1, settings)
self.assertEqual(order[:5], ['state', 'attach', 'profiles', 'nr', 'reg'])

def test_nr_on_leaves_the_nr_mode_alone(self):
settings = paths.config('/nonexistent')
settings['network']['apn'] = 'internet.example'
Expand Down
2 changes: 1 addition & 1 deletion packages/omamobile-modem-sit/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.35
0.3.36