Cellular: Fix packet data registration after CREG

Ari Parkkila · Ari Parkkila · commit de765a41f055 · 2020-05-25T11:17:59.000+03:00
diff --git a/features/cellular/framework/AT/AT_CellularNetwork.cpp b/features/cellular/framework/AT/AT_CellularNetwork.cpp
@@ -122,15 +122,14 @@ void AT_CellularNetwork::read_reg_params_and_compare(RegistrationType type)
     read_reg_params(type, reg_params);
 
     if (_at.get_last_error() == NSAPI_ERROR_OK && _connection_status_cb) {
-        _reg_params._type = type;
         cell_callback_data_t data;
         data.error = NSAPI_ERROR_OK;
         if (reg_params._act != _reg_params._act) {
             _reg_params._act = reg_params._act;
             data.status_data = reg_params._act;
             _connection_status_cb((nsapi_event_t)CellularRadioAccessTechnologyChanged, (intptr_t)&data);
         }
-        if (reg_params._status != _reg_params._status) {
+        if (reg_params._status != _reg_params._status || type != _reg_params._type) {
             RegistrationStatus previous_registration_status = _reg_params._status;
             _reg_params._status = reg_params._status;
             data.status_data = reg_params._status;
@@ -150,6 +149,7 @@ void AT_CellularNetwork::read_reg_params_and_compare(RegistrationType type)
             data.status_data = reg_params._cell_id;
             _connection_status_cb((nsapi_event_t)CellularCellIDChanged, (intptr_t)&data);
         }
+        _reg_params._type = type;
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -122,15 +122,14 @@ void AT_CellularNetwork::read_reg_params_and_compare(RegistrationType type)`
`122`	`122`	`read_reg_params(type, reg_params);`
`123`	`123`
`124`	`124`	`if (_at.get_last_error() == NSAPI_ERROR_OK && _connection_status_cb) {`
`125`		`- _reg_params._type = type;`
`126`	`125`	`cell_callback_data_t data;`
`127`	`126`	`data.error = NSAPI_ERROR_OK;`
`128`	`127`	`if (reg_params._act != _reg_params._act) {`
`129`	`128`	`_reg_params._act = reg_params._act;`
`130`	`129`	`data.status_data = reg_params._act;`
`131`	`130`	`_connection_status_cb((nsapi_event_t)CellularRadioAccessTechnologyChanged, (intptr_t)&data);`
`132`	`131`	`}`
`133`		`- if (reg_params._status != _reg_params._status) {`
	`132`	`+ if (reg_params._status != _reg_params._status \|\| type != _reg_params._type) {`
`134`	`133`	`RegistrationStatus previous_registration_status = _reg_params._status;`
`135`	`134`	`_reg_params._status = reg_params._status;`
`136`	`135`	`data.status_data = reg_params._status;`
`@@ -150,6 +149,7 @@ void AT_CellularNetwork::read_reg_params_and_compare(RegistrationType type)`
`150`	`149`	`data.status_data = reg_params._cell_id;`
`151`	`150`	`_connection_status_cb((nsapi_event_t)CellularCellIDChanged, (intptr_t)&data);`
`152`	`151`	`}`
	`152`	`+ _reg_params._type = type;`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`