Skip to content
This repository has been archived by the owner on Feb 17, 2020. It is now read-only.

Commit

Permalink
fix: removed comments and unnessecary line
Browse files Browse the repository at this point in the history
  • Loading branch information
simensrostad committed Aug 23, 2019
1 parent 6fa5668 commit dae1df8
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 38 deletions.
2 changes: 0 additions & 2 deletions applications/cat_tracker/src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ static void work_init(void)
k_work_init(&cloud_get_work, cloud_get_work_fn);
}

/*Fix*/
static const char status1[] = "+CEREG: 1";
static const char status2[] = "+CEREG:1";
static const char status3[] = "+CEREG: 5";
Expand Down Expand Up @@ -272,7 +271,6 @@ void main(void)
printk("The cat tracker has started\n");
work_init();
adxl362_init();
// led_init(); led thread should be fixed to use thread start
cloud_configuration_init();
lte_connect();
gps_control_init(gps_control_handler);
Expand Down
67 changes: 31 additions & 36 deletions drivers/nrf9160_gps/nrf9160_gps.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@

LOG_MODULE_REGISTER(nrf9160_gps, CONFIG_NRF9160_GPS_LOG_LEVEL);

#define AT_CMD_LEN(x) (sizeof(x) - 1)
#define AT_XSYSTEMMODE_REQUEST "AT%XSYSTEMMODE?"
#define AT_XSYSTEMMODE_RESPONSE "%XSYSTEMMODE:"
#define AT_XSYSTEMMODE_PROTO "AT%%XSYSTEMMODE=%d,%d,%d,%d"
#define AT_XSYSTEMMODE_PARAMS_COUNT 4
#define AT_XSYSTEMMODE_GPS_PARAM_INDEX 2
#define AT_CFUN_REQUEST "AT+CFUN?"
#define AT_CFUN_RESPONSE "+CFUN:"
#define AT_CFUN_0 "AT+CFUN=0"
#define AT_CFUN_1 "AT+CFUN=1"
#define FUNCTIONAL_MODE_ENABLED 1
#define AT_CMD_LEN(x) (sizeof(x) - 1)
#define AT_XSYSTEMMODE_REQUEST "AT%XSYSTEMMODE?"
#define AT_XSYSTEMMODE_RESPONSE "%XSYSTEMMODE:"
#define AT_XSYSTEMMODE_PROTO "AT%%XSYSTEMMODE=%d,%d,%d,%d"
#define AT_XSYSTEMMODE_PARAMS_COUNT 4
#define AT_XSYSTEMMODE_GPS_PARAM_INDEX 2
#define AT_CFUN_REQUEST "AT+CFUN?"
#define AT_CFUN_RESPONSE "+CFUN:"
#define AT_CFUN_0 "AT+CFUN=0"
#define AT_CFUN_1 "AT+CFUN=1"
#define FUNCTIONAL_MODE_ENABLED 1

struct gps_drv_data {
gps_trigger_handler_t trigger_handler;
Expand Down Expand Up @@ -143,8 +143,8 @@ static void gps_thread(int dev_ptr)
case NRF_GNSS_PVT_DATA_ID:
copy_pvt(&fresh_pvt.pvt, &raw_gps_data.pvt);

if ((drv_data->trigger.chan == GPS_CHAN_PVT)
&& (drv_data->trigger.type == GPS_TRIG_DATA_READY)) {
if ((drv_data->trigger.chan == GPS_CHAN_PVT) &&
(drv_data->trigger.type == GPS_TRIG_DATA_READY)) {
trigger_send = true;
LOG_DBG("PVT data ready");
}
Expand Down Expand Up @@ -215,8 +215,8 @@ static int init_thread(struct device *dev)
static int enable_gps(struct device *dev)
{
int err;
char buf[50] = {0};
struct at_param_list at_resp_list = {0};
char buf[50] = { 0 };
struct at_param_list at_resp_list = { 0 };
u16_t gps_param_value, functional_mode;

err = at_params_list_init(&at_resp_list, AT_XSYSTEMMODE_PARAMS_COUNT);
Expand All @@ -225,24 +225,22 @@ static int enable_gps(struct device *dev)
return err; /* No need to clean up; the list was never init'd */
}

err = at_cmd_write(AT_XSYSTEMMODE_REQUEST, buf, sizeof(buf), NULL);
err = at_cmd_write(AT_XSYSTEMMODE_REQUEST, buf, sizeof(buf), NULL);
if (err) {
LOG_ERR("Could not get modem's system mode");
err = -EIO;
goto enable_gps_clean_exit;
}

err = at_parser_max_params_from_str(
&buf[sizeof(AT_XSYSTEMMODE_RESPONSE)],
&at_resp_list,
&buf[sizeof(AT_XSYSTEMMODE_RESPONSE)], &at_resp_list,
AT_XSYSTEMMODE_PARAMS_COUNT);
if (err) {
LOG_ERR("Could not parse AT response, error: %d", err);
goto enable_gps_clean_exit;
}

err = at_params_short_get(&at_resp_list,
AT_XSYSTEMMODE_GPS_PARAM_INDEX,
err = at_params_short_get(&at_resp_list, AT_XSYSTEMMODE_GPS_PARAM_INDEX,
&gps_param_value);
if (err) {
LOG_ERR("Could not get GPS mode state, error: %d", err);
Expand Down Expand Up @@ -282,9 +280,8 @@ static int enable_gps(struct device *dev)
goto enable_gps_clean_exit;
}

err = at_parser_max_params_from_str(
&buf[sizeof(AT_CFUN_RESPONSE)],
&at_resp_list, 1);
err = at_parser_max_params_from_str(&buf[sizeof(AT_CFUN_RESPONSE)],
&at_resp_list, 1);
if (err) {
LOG_ERR("Could not parse functional mode response, error: %d",
err);
Expand All @@ -297,7 +294,6 @@ static int enable_gps(struct device *dev)
err);
goto enable_gps_clean_exit;
}
LOG_DBG("Functional mode: %d", functional_mode);

LOG_DBG("Functional mode: %d", functional_mode);

Expand Down Expand Up @@ -418,20 +414,19 @@ static int init(struct device *dev)

init_thread(dev);

#if CONFIG_NRF9160_GPS_SET_MAGPIO
int err;
char buf[50] = {0};
#if CONFIG_NRF9160_GPS_SET_MAGPIO
int err;
char buf[50] = { 0 };

err = at_cmd_write(CONFIG_NRF9160_GPS_MAGPIO_STRING,
buf, sizeof(buf), NULL);
if (err) {
LOG_ERR("Could not confiugure MAGPIO, error: %d", err);
return err;
}
err = at_cmd_write(CONFIG_NRF9160_GPS_MAGPIO_STRING, buf, sizeof(buf),
NULL);
if (err) {
LOG_ERR("Could not confiugure MAGPIO, error: %d", err);
return err;
}

LOG_DBG("MAGPIO set: %s",
log_strdup(CONFIG_NRF9160_GPS_MAGPIO_STRING));
#endif /* CONFIG_NRF9160_GPS_SET_MAGPIO */
LOG_DBG("MAGPIO set: %s", log_strdup(CONFIG_NRF9160_GPS_MAGPIO_STRING));
#endif /* CONFIG_NRF9160_GPS_SET_MAGPIO */

return 0;
}
Expand Down

0 comments on commit dae1df8

Please sign in to comment.