kopia lustrzana https://github.com/bristol-seds/pico-tracker
Add BMP180 to data.c, format output correctly
rodzic
7e36fba32a
commit
350147a3d7
|
@ -46,7 +46,7 @@ typedef struct tracker_datapoint {
|
|||
/* Sensors */
|
||||
float battery; /* Volts */
|
||||
float solar; /* Volts */
|
||||
float main_pressure; /* Pa */
|
||||
int32_t main_pressure; /* Pa */
|
||||
float thermistor_temperature; /* ºC */
|
||||
float bmp180_temperature; /* ºC */
|
||||
float radio_die_temperature; /* ºC */
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
#include "xosc.h"
|
||||
#include "hw_config.h"
|
||||
#include "analogue.h"
|
||||
#include "bmp180.h"
|
||||
#include "gps.h"
|
||||
#include "ubx_messages.h"
|
||||
#include "telemetry.h"
|
||||
|
@ -68,6 +69,13 @@ struct tracker_datapoint* collect_data(void)
|
|||
datapoint.solar = get_solar(); /* Will return zero by default */
|
||||
datapoint.radio_die_temperature = telemetry_si_temperature();
|
||||
|
||||
/**
|
||||
* ---- Barometer ----
|
||||
*/
|
||||
struct barometer* b = get_barometer();
|
||||
datapoint.main_pressure = b->pressure;
|
||||
datapoint.bmp180_temperature = (float)b->temperature;
|
||||
|
||||
/**
|
||||
* ---- GPS ----
|
||||
*/
|
||||
|
|
|
@ -68,7 +68,7 @@ uint16_t format_telemetry_string(char* string, struct tracker_datapoint* dp,
|
|||
|
||||
/* sprintf - full string (approx 90 chars) */
|
||||
len += sprintf(telemetry_string + len,
|
||||
"%s,%02u:%02u:%02u,%02u%02u%02u,%02.5f,%03.5f,%ld,%u,%.2f,%.0f,%.1f,%.1f,%.1f,%ld",
|
||||
"%s,%02u:%02u:%02u,%02u%02u%02u,%02.5f,%03.5f,%ld,%u,%.2f,%d,%.1f,%.1f,%.1f,%ld",
|
||||
CALLSIGN, /* 2+6+2+1=11 */
|
||||
dp->time.hour, dp->time.minute, dp->time.second, /* 2+1+2+1+2+1=9 */
|
||||
dp->time.year%100, dp->time.month, dp->time.day, /* 2+2+2+1=7 */
|
||||
|
|
Ładowanie…
Reference in New Issue