vlad/Rocket2021
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changes from samara

Browse Source
This commit is contained in:
Vlad Utkin
2021-06-10 16:06:27 +03:00
parent b4adcc4dee
commit 40ea3a8693
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/constants.h
View File

@@ -5,4 +5,5 @@
#define ALTITUDE_THRESHOLD 50.0 #define ALTITUDE_THRESHOLD 50.0
#define PRESSURE_THRESHOLD 3.0 #define PRESSURE_THRESHOLD 3.0
#define START_ACCELERATION_THRESHOLD 5.0 #define START_ACCELERATION_THRESHOLD 5.0
#define TIME_TO_DEPLOY 8 * 1000 #define TIME_TO_DEPLOY 20 * 1000
#define PWM 32

2
src/lora.h
View File

@@ -8,7 +8,7 @@
#define NRESET 35 //reset on LoRa device #define NRESET 35 //reset on LoRa device
#define DIO0 33 //DIO0 on LoRa device, used for RX and TX done #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 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 #define LORA_DEVICE DEVICE_SX1278 //this is the device we are using

6
src/main.cpp
View File

@@ -11,8 +11,6 @@
#include "gps.h" #include "gps.h"
#include "lora.h" #include "lora.h"
#define PWM 34
bool deployed = 0; bool deployed = 0;
void deploy() void deploy()
@@ -88,7 +86,7 @@ void loop()
{ {
DynamicJsonDocument doc(1024); DynamicJsonDocument doc(1024);
JsonObject obj = doc.to<JsonObject>(); JsonObject obj = doc.to<JsonObject>();
obj["seconds"] = millis() / 1000; obj["millis"] = millis();
obj["deployed"] = deployed; obj["deployed"] = deployed;
obj["save"] = save; obj["save"] = save;
obj["flight"] = flight; obj["flight"] = flight;
@@ -140,5 +138,5 @@ void loop()
} }
//Wait for 1 second //Wait for 1 second
previous_height = obj["bmp388"]["altitude"].as<float>(); previous_height = obj["bmp388"]["altitude"].as<float>();
delay(200); delay(100);
} }