From 40ea3a8693b9dd3ef4d46a69baca71c61a66f383 Mon Sep 17 00:00:00 2001 From: Vlad Utkin Date: Thu, 10 Jun 2021 16:06:27 +0300 Subject: [PATCH] Changes from samara --- src/constants.h | 3 ++- src/lora.h | 2 +- src/main.cpp | 6 ++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/constants.h b/src/constants.h index f83848b..ee57ea8 100644 --- a/src/constants.h +++ b/src/constants.h @@ -5,4 +5,5 @@ #define ALTITUDE_THRESHOLD 50.0 #define PRESSURE_THRESHOLD 3.0 #define START_ACCELERATION_THRESHOLD 5.0 -#define TIME_TO_DEPLOY 8 * 1000 +#define TIME_TO_DEPLOY 20 * 1000 +#define PWM 32 diff --git a/src/lora.h b/src/lora.h index 553c123..813a5c3 100644 --- a/src/lora.h +++ b/src/lora.h @@ -8,7 +8,7 @@ #define NRESET 35 //reset on LoRa device #define DIO0 33 //DIO0 on LoRa device, used for RX and TX done -#define DIO1 32 //DIO1 on LoRa device, normally not used so set to -1 +#define DIO1 -1 //DIO1 on LoRa device, normally not used so set to -1 #define DIO2 -1 //DIO2 on LoRa device, normally not used so set to -1 #define LORA_DEVICE DEVICE_SX1278 //this is the device we are using diff --git a/src/main.cpp b/src/main.cpp index 6e42a71..983a842 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -11,8 +11,6 @@ #include "gps.h" #include "lora.h" -#define PWM 34 - bool deployed = 0; void deploy() @@ -88,7 +86,7 @@ void loop() { DynamicJsonDocument doc(1024); JsonObject obj = doc.to(); - obj["seconds"] = millis() / 1000; + obj["millis"] = millis(); obj["deployed"] = deployed; obj["save"] = save; obj["flight"] = flight; @@ -140,5 +138,5 @@ void loop() } //Wait for 1 second previous_height = obj["bmp388"]["altitude"].as(); - delay(200); + delay(100); }