April 2022 - gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: pgw: Add TC_gy_charging_cc_time

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27854 to look at the new patch set (#2). Change subject: pgw: Add TC_gy_charging_cc_time ...................................................................... pgw: Add TC_gy_charging_cc_time Related: SYS#5276 Change-Id: Ie4e567f62bbbdba276e6b3221111c8d9f82cde14 --- M pgw/PGW_Tests.ttcn 1 file changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/54/27854/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie4e567f62bbbdba276e6b3221111c8d9f82cde14 Gerrit-Change-Number: 27854 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: pgw: Initial Gy support

by pespin

Attention is currently required from: osmith, fixeria. Hello osmith, Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27853 to look at the new patch set (#3). Change subject: pgw: Initial Gy support ...................................................................... pgw: Initial Gy support Related: SYS#5276 Change-Id: I04cf78cb4bc73de59f803c01208a7ef9056cb14f --- M pgw/PGW_Tests.ttcn 1 file changed, 82 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/53/27853/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I04cf78cb4bc73de59f803c01208a7ef9056cb14f Gerrit-Change-Number: 27853 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: pgw: Initial Gy support

by pespin

Attention is currently required from: osmith, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27853 ) Change subject: pgw: Initial Gy support ...................................................................... Patch Set 2: (1 comment) File pgw/PGW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27853/comment/f21c71c9_7c6f… PS2, Line 320: Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, > Why would it be important not to use log2str here? Why would it be important to use log2str here? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I04cf78cb4bc73de59f803c01208a7ef9056cb14f Gerrit-Change-Number: 27853 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Apr 2022 09:05:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: pgw: Initial Gy support

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27853 ) Change subject: pgw: Initial Gy support ...................................................................... Patch Set 2: Code-Review+1 (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27853/comment/204b0fc5_da14… PS2, Line 9: Change-Id: I04cf78cb4bc73de59f803c01208a7ef9056cb14f Related issue would be very useful for timesheet, I guess SYS#5276 File pgw/PGW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27853/comment/ba558b13_9e48… PS2, Line 320: Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, > Let's keep setverdict() separate from f_shutdown(), so that there is no need to use log2str(). Why would it be important not to use log2str here? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I04cf78cb4bc73de59f803c01208a7ef9056cb14f Gerrit-Change-Number: 27853 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Apr 2022 09:03:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: pgw: Support having several DIAMETER_ConnHdlr per PGW_Session_CT

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27852 ) Change subject: pgw: Support having several DIAMETER_ConnHdlr per PGW_Session_CT ...................................................................... pgw: Support having several DIAMETER_ConnHdlr per PGW_Session_CT A new intermediate component DIAMETER_ConnHdlr_CT is added which extends the required DIAMETER_ConnHdlr by the DIAMETER_Emulation, and forwards it to the PGW_Session_CT. This way, the PGW_Session_CT, which usually runs the test code, will have access to GTP2, Gx and Gy messages for the session. Initial Gy support for PGW_Tests is added in follow-up patch. Change-Id: I28f1ac0a013e479058f28a6feff6901b33f6c247 --- M pgw/PGW_Tests.ttcn 1 file changed, 62 insertions(+), 29 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index 775b904..16bea57 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -37,9 +37,9 @@ port GTP2EM_PT TEID0; /* emulated PCRF */ - var DIAMETER_Emulation_CT vc_DIAMETER; - port DIAMETER_PT DIAMETER_UNIT; - port DIAMETEREM_PROC_PT DIAMETER_PROC; + var DIAMETER_Emulation_CT vc_Gx; + port DIAMETER_PT Gx_UNIT; + port DIAMETEREM_PROC_PT Gx_PROC; /* global test case guard timer (actual timeout value is set in f_init()) */ timer T_guard; } @@ -52,10 +52,36 @@ } } +type component DIAMETER_ConnHdlr_CT extends DIAMETER_ConnHdlr { + port DIAMETER_Conn_PT DIAMETER_CLIENT; +} + +function f_diam_connhldr_ct_main(hexstring imsi) runs on DIAMETER_ConnHdlr_CT { + var PDU_DIAMETER msg; + + if (DIAMETER_PROC.checkstate("Connected")) { + f_diameter_expect(imsi); + } + + while (true) { + alt { + [] DIAMETER_CLIENT.receive(PDU_DIAMETER:?) -> value msg { + DIAMETER.send(msg); + } + [] DIAMETER.receive(PDU_DIAMETER:?) -> value msg { + DIAMETER_CLIENT.send(msg); + } + } + } +} + + /* per-session component; we typically have 1..N per testcase */ -type component PGW_Session_CT extends GTP2_ConnHdlr, DIAMETER_ConnHdlr { +type component PGW_Session_CT extends GTP2_ConnHdlr { var SessionPars g_pars; + port DIAMETER_Conn_PT Gx; + /* TEI (Data) local side */ var OCT4 g_teid; /* TEI (Control) local side */ @@ -139,13 +165,13 @@ auth_app_id := omit, vendor_app_id := c_DIAMETER_3GPP_Gx_AID }; - vc_DIAMETER := DIAMETER_Emulation_CT.create(id); - map(vc_DIAMETER:DIAMETER, system:DIAMETER_CODEC_PT); - connect(vc_DIAMETER:DIAMETER_UNIT, self:DIAMETER_UNIT); - connect(vc_DIAMETER:DIAMETER_PROC, self:DIAMETER_PROC); - vc_DIAMETER.start(DIAMETER_Emulation.main(ops, pars, id)); + vc_Gx := DIAMETER_Emulation_CT.create(id); + map(vc_Gx:DIAMETER, system:DIAMETER_CODEC_PT); + connect(vc_Gx:DIAMETER_UNIT, self:Gx_UNIT); + connect(vc_Gx:DIAMETER_PROC, self:Gx_PROC); + vc_Gx.start(DIAMETER_Emulation.main(ops, pars, id)); - f_diameter_wait_capability(DIAMETER_UNIT); + f_diameter_wait_capability(Gx_UNIT); /* Give some time for our emulation to get out of SUSPECT list of SUT (3 watchdong ping-pongs): * RFC6733 sec 5.1 * RFC3539 sec 3.4.1 [5] @@ -177,31 +203,38 @@ } } -function f_start_handler(void_fn fn, template (omit) SessionPars pars := omit) +function f_start_handler(void_fn fn, template (omit) SessionPars pars_tmpl := omit) runs on PGW_Test_CT return PGW_Session_CT { var charstring id := testcasename(); + var DIAMETER_ConnHdlr_CT vc_conn_gx; var PGW_Session_CT vc_conn; + var SessionPars pars; + + if (isvalue(pars_tmpl)) { + pars := valueof(pars_tmpl); + } else { + /*TODO: set default values */ + } + vc_conn := PGW_Session_CT.create(id); connect(vc_conn:GTP2, vc_GTP2:CLIENT); connect(vc_conn:GTP2_PROC, vc_GTP2:CLIENT_PROC); - if (isbound(vc_DIAMETER)) { - connect(vc_conn:DIAMETER, vc_DIAMETER:DIAMETER_CLIENT); - connect(vc_conn:DIAMETER_PROC, vc_DIAMETER:DIAMETER_PROC); + if (isbound(vc_Gx)) { + vc_conn_gx := DIAMETER_ConnHdlr_CT.create(id); + connect(vc_conn_gx:DIAMETER, vc_Gx:DIAMETER_CLIENT); + connect(vc_conn_gx:DIAMETER_PROC, vc_Gx:DIAMETER_PROC); + connect(vc_conn:Gx, vc_conn_gx:DIAMETER_CLIENT); + vc_conn_gx.start(f_diam_connhldr_ct_main(pars.imsi)); } vc_conn.start(f_handler_init(fn, pars)); return vc_conn; } -private function f_handler_init(void_fn fn, template (omit) SessionPars pars := omit) +private function f_handler_init(void_fn fn, SessionPars pars) runs on PGW_Session_CT { - if (isvalue(pars)) { - g_pars := valueof(pars); - } - if (DIAMETER_PROC.checkstate("Connected")) { - f_diameter_expect(g_pars.imsi); - } + g_pars := valueof(pars); fn.apply(); } @@ -225,9 +258,9 @@ return f_concat_pad(12, '49123'H, suffix); } -private altstep as_DIA_CCR(DCC_NONE_CC_Request_Type req_type) runs on PGW_Session_CT { +private altstep as_DIA_Gx_CCR(DCC_NONE_CC_Request_Type req_type) runs on PGW_Session_CT { var PDU_DIAMETER rx_dia; - [] DIAMETER.receive(tr_DIA_Gx_CCR(req_type := req_type)) -> value rx_dia { + [] Gx.receive(tr_DIA_Gx_CCR(req_type := req_type)) -> value rx_dia { var template (omit) AVP avp; var octetstring sess_id; var AVP_Unsigned32 req_num; @@ -238,10 +271,10 @@ avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_DCC_NONE_CC_Request_Number); req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number); - DIAMETER.send(ts_DIA_Gx_CCA(rx_dia.hop_by_hop_id, rx_dia.end_to_end_id, sess_id, + Gx.send(ts_DIA_Gx_CCA(rx_dia.hop_by_hop_id, rx_dia.end_to_end_id, sess_id, req_type, req_num)); } - [] DIAMETER.receive(PDU_DIAMETER:?) -> value rx_dia { + [] Gx.receive(PDU_DIAMETER:?) -> value rx_dia { setverdict(fail, "Received unexpected DIAMETER ", rx_dia); self.stop; } @@ -330,8 +363,8 @@ g2c.gtpcv2_pdu.createSessionRequest.servingNetwork := ts_GTP2C_ServingNetwork('001'H, '01F'H); GTP2.send(g2c); - if (DIAMETER_PROC.checkstate("Connected")) { - as_DIA_CCR(INITIAL_REQUEST); + if (Gx.checkstate("Connected")) { + as_DIA_Gx_CCR(INITIAL_REQUEST); } alt { [] GTP2.receive(tr_GTP2C_CreateSessionResp(d_teid:=g_teic, cause:='10'O)) -> value rx { @@ -389,8 +422,8 @@ teid_list := {}, bearer_id := 1); GTP2.send(g2c); - if (DIAMETER_PROC.checkstate("Connected") and expect_diameter) { - as_DIA_CCR(TERMINATION_REQUEST); + if (Gx.checkstate("Connected") and expect_diameter) { + as_DIA_Gx_CCR(TERMINATION_REQUEST); } alt { [] GTP2.receive(tr_GTP2C_DeleteSessionResp(d_teid := exp_teid, cause := exp_cause)) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I28f1ac0a013e479058f28a6feff6901b33f6c247 Gerrit-Change-Number: 27852 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: pgw: Initial Gy support

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27853 ) Change subject: pgw: Initial Gy support ...................................................................... Patch Set 2: (1 comment) File pgw/PGW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27853/comment/b11b9a24_80c4… PS2, Line 320: Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, I see no point in doing so. I think it's actually perfect to do it this way. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I04cf78cb4bc73de59f803c01208a7ef9056cb14f Gerrit-Change-Number: 27853 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Apr 2022 08:54:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb fw/gpsdo: Limit the fine tuning range

by tnt

Attention is currently required from: tnt. tnt has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27895 ) Change subject: icE1usb fw/gpsdo: Limit the fine tuning range ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27895 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I2d9d348f5466f581b3d6d36c98847c47e2452f98 Gerrit-Change-Number: 27895 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-MessageType: deleteVote

3 years, 4 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb fw/gpsdo: Never use invalid measurements to feed loop

by tnt

Attention is currently required from: tnt. tnt has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27892 ) Change subject: icE1usb fw/gpsdo: Never use invalid measurements to feed loop ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I9c7b81c6e2e600ed49ac766fa33df23747dd339e Gerrit-Change-Number: 27892 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-MessageType: deleteVote

3 years, 4 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb fw/gpsdo: Limit the fine tuning range

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27895 ) Change subject: icE1usb fw/gpsdo: Limit the fine tuning range ...................................................................... icE1usb fw/gpsdo: Limit the fine tuning range Fine tuning has a limited tuning range. If at some point we hit the limits, we need to bit the bullet and try to 'transfer' some of that to the coarse range as best as we can. Hopefully we get it close enough to limit disruption. Note that this should really never happen because although it's limited, the tuning range should be good enough to absorb any reasonable temperature / aging variation once we have coarse tuned. Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I2d9d348f5466f581b3d6d36c98847c47e2452f98 --- M firmware/ice40-riscv/icE1usb/gpsdo.c 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/95/27895/1 diff --git a/firmware/ice40-riscv/icE1usb/gpsdo.c b/firmware/ice40-riscv/icE1usb/gpsdo.c index 057490f..c1df4b0 100644 --- a/firmware/ice40-riscv/icE1usb/gpsdo.c +++ b/firmware/ice40-riscv/icE1usb/gpsdo.c @@ -240,8 +240,23 @@ g_gpsdo.fine.div = 0; } - /* Apply value with a bias from long term accumulator */ + /* Compute value with a bias from long term accumulator */ tune = g_gpsdo.tune.fine - (g_gpsdo.fine.acc / 2); + + /* If fine tune is getting close to boundary, do our + * best to transfer part of it to coarse tuning */ + if ((g_gpsdo.tune.fine < 512) || (g_gpsdo.tune.fine > 3584)) + { + int coarse_adj = ((int)g_gpsdo.tune.fine - 2048) >> 6; + + g_gpsdo.tune.coarse += coarse_adj; + g_gpsdo.tune.fine -= coarse_adj << 6; + tune -= coarse_adj << 6; + + pdm_set(PDM_CLK_HI, true, g_gpsdo.tune.coarse, false); + } + + /* Apply fine */ pdm_set(PDM_CLK_LO, true, tune, false); /* Debug */ -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27895 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I2d9d348f5466f581b3d6d36c98847c47e2452f98 Gerrit-Change-Number: 27895 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb fw/gpsdo: Attempt to recover from bad tuning

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27894 ) Change subject: icE1usb fw/gpsdo: Attempt to recover from bad tuning ...................................................................... icE1usb fw/gpsdo: Attempt to recover from bad tuning If we're in hold over mode and getting a bunch of invalid frequency measurement despite a good fix, then we most likely ended up on a bad tuning value and we need to recover by starting from scratch. Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: If8503a3eaf695e02a0ef0a3b6536de985d247c20 --- M firmware/ice40-riscv/icE1usb/gpsdo.c 1 file changed, 17 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/94/27894/1 diff --git a/firmware/ice40-riscv/icE1usb/gpsdo.c b/firmware/ice40-riscv/icE1usb/gpsdo.c index c94a5ed..057490f 100644 --- a/firmware/ice40-riscv/icE1usb/gpsdo.c +++ b/firmware/ice40-riscv/icE1usb/gpsdo.c @@ -280,6 +280,7 @@ if (!gps_has_valid_fix()) { /* No GPS fix, go to hold-over */ g_gpsdo.state = STATE_HOLD_OVER; + g_gpsdo.meas.invalid = 0; return; } @@ -293,10 +294,22 @@ return; } } else { - /* Count invalid measurements and if too many of - * them, we go back to hold-over */ - if (++g_gpsdo.meas.invalid >= MAX_INVALID) - g_gpsdo.state = STATE_HOLD_OVER; + /* Count invalid measurements */ + if (++g_gpsdo.meas.invalid >= MAX_INVALID) { + if (g_gpsdo.state != STATE_HOLD_OVER) { + /* We go back to hold-over */ + g_gpsdo.state = STATE_HOLD_OVER; + g_gpsdo.meas.invalid = 0; + } else { + /* We're in hold-over, with valid fix, and + * still get a bunch of invalid. Reset tuning */ + g_gpsdo.tune.coarse = 2048; + g_gpsdo.tune.fine = 2048; + + pdm_set(PDM_CLK_HI, true, g_gpsdo.tune.coarse, false); + pdm_set(PDM_CLK_LO, true, g_gpsdo.tune.fine, false); + } + } /* In all cases, invalid measurements are not used */ return; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27894 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: If8503a3eaf695e02a0ef0a3b6536de985d247c20 Gerrit-Change-Number: 27894 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022