Commit 6f1505c3 authored by Patrick's avatar Patrick

Merge branch 'master' into gsm-ultrasound

parents e92eeab2 4c51bf4a
......@@ -45,9 +45,9 @@ state_machine_e g_current_state = SLEEP_IDLE;
// readings are taken on ordinals (0/15/30/45)
t_SensorData last_reading_time;
#define ORDINAL_INTERVAL 1
#define ORDINAL_INTERVAL 15
#define NUM_MMNT 13 // measurement buffer length
#define NUM_MMNT 11 // measurement buffer length
// then create a pre-sized array of these structs to hold a set of timestamped measurements
uint8_t num_mmnt = NUM_MMNT;
t_measurement measurements[NUM_MMNT] = {};
......@@ -58,7 +58,7 @@ uint8_t readings_tail = 0;
// sends happen after a fixed number of ordinals
t_SensorData last_sending_time;
// how many readings should be collected for sending (<NUM_MMNT)
#define NUM_TO_SEND 12
#define NUM_TO_SEND 10
#if NUM_TO_SEND >= NUM_MMNT
#error "Can't hold all the readings, reduce NUM_TO_SEND below NUM_MMNT"
......@@ -66,7 +66,7 @@ t_SensorData last_sending_time;
void setup() {
RP.begin(true);
TM.begin(((char*)"training.teal-mallet.net"), ((char*)"a6c33855-49a0-5858-8ffe-3da7c2b0412d"));
TM.begin(((char*)"nw.teal-mallet.net"), ((char*)"aaaaaaaa-aaaa-aaa-aaa-aaaaaaaaaaaa"));
delay(100);
Serial.begin(BAUD);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment