Merge pull request sixfab#101 from sixfab/refactor/gps_data_format_change

Refactor: gps data format change

Author: selengalp

pico_lte/modules/gps.py

@@ -101,7 +101,7 @@ def get_location(self):
  * "response" --> Response of the command
  * "value" --> [lat,lon] Location of the device
  """
- command = "AT+QGPSLOC?"
+ command = "AT+QGPSLOC=2"
  desired = "+QGPSLOC: "
  result = self.atcom.send_at_comm(command, desired)
 

tests/test_modules_gps.py

@@ -31,7 +31,9 @@ def gps(self):
  @staticmethod
  def mock_send_at_comm(mocker, responses_to_return):
  """This is a wrapper function to repeated long mocker.patch() statements."""
- return mocker.patch("pico_lte.utils.atcom.ATCom.send_at_comm", return_value=responses_to_return)
+ return mocker.patch(
+ "pico_lte.utils.atcom.ATCom.send_at_comm", return_value=responses_to_return
+ )
 
  def test_constructor(self, gps):
  """This method tests the __init__ constructor."""
@@ -68,7 +70,8 @@ def test_set_priority(self, mocker, gps, mocked_response):
 
  @pytest.mark.parametrize(
  "mocked_response",
- [{"status": Status.SUCCESS, "response": ["+CME ERROR: 504"]}] + default_response_types(),
+ [{"status": Status.SUCCESS, "response": ["+CME ERROR: 504"]}]
+ + default_response_types(),
  )
  def test_turn_on_default_parameters(self, mocker, gps, mocked_response):
  """This method tests the turn_on() with predefined parameters."""
@@ -90,7 +93,9 @@ def test_turn_on_with_different_parameters(
  mocking = TestGPS.mock_send_at_comm(mocker, mocked_response)
  result = gps.turn_on(mode, accuracy, fix_count, fix_rate)
 
- mocking.assert_called_once_with(f"AT+QGPS={mode},{accuracy},{fix_count},{fix_rate}")
+ mocking.assert_called_once_with(
+ f"AT+QGPS={mode},{accuracy},{fix_count},{fix_rate}"
+ )
  assert result == mocked_response
 
  @pytest.mark.parametrize("mocked_response", default_response_types())
@@ -108,7 +113,7 @@ def test_turn_off(self, mocker, gps, mocked_response):
  {
  "status": Status.SUCCESS,
  "response": [
- "+QGPSLOC: 061951.00,3150.7223N,11711.9293E,0.7,62.2,2,0.00,0.0,0.0,110513,09",
+ "+QGPSLOC: 061951.00,41.02044,28.99797,0.7,62.2,2,0.00,0.0,0.0,110513,09",
  "OK",
  ],
  },
@@ -121,9 +126,9 @@ def test_get_location(self, mocker, gps, mocked_response):
  mocking = TestGPS.mock_send_at_comm(mocker, mocked_response)
  result = gps.get_location()
 
- mocking.assert_called_once_with("AT+QGPSLOC?", "+QGPSLOC: ")
+ mocking.assert_called_once_with("AT+QGPSLOC=2", "+QGPSLOC: ")
 
  if result["status"] == Status.SUCCESS:
- assert result["value"] == ["3150.7223N", "11711.9293E"]
+ assert result["value"] == ["41.02044", "28.99797"]
  assert result["status"] == mocked_response["status"]
  assert result["response"] == mocked_response["response"]