Changes from samara
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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<JsonObject>();
|
||||
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<float>();
|
||||
delay(200);
|
||||
delay(100);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user