diff --git a/defs_8h.html b/defs_8h.html index 6cb7684..8ac2ed7 100644 --- a/defs_8h.html +++ b/defs_8h.html @@ -115,7 +115,7 @@ Macros #define MQTT   0   -#define XBEE   1 +#define XBEE   0   #define BAUDRATE   115200 @@ -240,7 +240,7 @@

Variables

-const char MQTT_SERVER [30] = "192.168.0.106" +const char MQTT_SERVER [30] = "192.168.0.105"   const char MQTT_TELEMETRY_TOPIC [30] = "n4/flight-computer-1" @@ -739,7 +739,7 @@

- +
#define XBEE   1#define XBEE   0
diff --git a/defs_8h_source.html b/defs_8h_source.html index 47eccc7..32528c6 100644 --- a/defs_8h_source.html +++ b/defs_8h_source.html @@ -109,11 +109,11 @@
9#include <Arduino.h>
10
14#define MQTT 0
-
15#define XBEE 1
+
15#define XBEE 0
16
17#define BAUDRATE 115200
-
18#define GPS_BAUD_RATE 9600
-
19#define XBEE_BAUD_RATE 9600
+
18#define GPS_BAUD_RATE 9600
+
19#define XBEE_BAUD_RATE 9600
20
21/* debug parameters for use during testing - set to 0 for production */
22#define DEBUGGING 1
@@ -172,7 +172,7 @@
77/* MQTT constants */
78//const char MQTT_SERVER[30] = "192.168.1.101";
79// const char MQTT_SERVER[30] = "broker.emqx.io";
-
80const char MQTT_SERVER[30] = "192.168.0.106";
+
80const char MQTT_SERVER[30] = "192.168.0.105";
81const char MQTT_TELEMETRY_TOPIC[30] = "n4/flight-computer-1"; /* make this topic unique to every rocket */
82const char MQTT_ARMING_TOPIC[30] = "n4/commands"; /* make this topic unique to every rocket */
83#define MQTT_PORT 1883
diff --git a/doxygen_crawl.html b/doxygen_crawl.html index eae46ba..7665592 100644 --- a/doxygen_crawl.html +++ b/doxygen_crawl.html @@ -162,7 +162,6 @@ - @@ -172,6 +171,7 @@ + diff --git a/globals.html b/globals.html index 3a69345..13e2e0a 100644 --- a/globals.html +++ b/globals.html @@ -194,7 +194,7 @@

- m -

  • MQTT : defs.h
  • mqtt_command_processor() : main.cpp
  • MQTT_PORT : defs.h
    • -
  • MQTT_Reconnect() : main.cpp
    • +
  • MQTT_Reconnect() : main.cpp
  • MQTT_TOPIC_LENGTH : defs.h
  • MQTT_TransmitTelemetry() : main.cpp
  • MQTTInit() : main.cpp
    • diff --git a/globals_func.html b/globals_func.html index f9a8546..b64bc9f 100644 --- a/globals_func.html +++ b/globals_func.html @@ -119,7 +119,7 @@
  • loop() : main.cpp
  • mainChuteDeploy() : main.cpp
  • mqtt_command_processor() : main.cpp
    • -
  • MQTT_Reconnect() : main.cpp
    • +
  • MQTT_Reconnect() : main.cpp
  • MQTT_TransmitTelemetry() : main.cpp
  • MQTTInit() : main.cpp
  • non_blocking_buzz() : main.cpp
    • diff --git a/logger_8h_source.html b/logger_8h_source.html index 3807af1..1889d32 100644 --- a/logger_8h_source.html +++ b/logger_8h_source.html @@ -148,7 +148,7 @@
    DataLogger::loggerEquals
    void loggerEquals()
    helper function to print = for data formatting
    Definition logger.cpp:265
    data_types.h
    defines the data types, structs and typedefs used to store flight data
    telemetry_type_t
    struct Telemetry_Data telemetry_type_t
    -
    file
    SerialFlashFile file
    Definition main.cpp:142
    +
    file
    SerialFlashFile file
    Definition main.cpp:144
diff --git a/navtreeindex0.js b/navtreeindex0.js index 8f8b03b..8350a17 100644 --- a/navtreeindex0.js +++ b/navtreeindex0.js @@ -140,7 +140,6 @@ var NAVTREEINDEX0 = "src_2main_8cpp.html#a582e3dadcae4266158f0516e7c264bb6":[17,0,0,1,4,22], "src_2main_8cpp.html#a5947e71102388e9d5bfd09f8e97d668c":[17,0,0,1,4,25], "src_2main_8cpp.html#a59b33f351d47779eaaff510227075be1":[17,0,0,1,4,41], -"src_2main_8cpp.html#a5a48a88cefb37379fe58c0f58d0c274f":[17,0,0,1,4,20], "src_2main_8cpp.html#a5bef7886537f878149917a29939a5cb0":[17,0,0,1,4,44], "src_2main_8cpp.html#a5db507f1ef37ed2d76f24c064e4e6a85":[17,0,0,1,4,29], "src_2main_8cpp.html#a623ea109418725f80cfc705f49fd7a55":[17,0,0,1,4,21], @@ -150,6 +149,7 @@ var NAVTREEINDEX0 = "src_2main_8cpp.html#a7614084d3b4eca93954d98680cc2443d":[17,0,0,1,4,10], "src_2main_8cpp.html#a7ce5e586674f4cd4260bd2aaba246757":[17,0,0,1,4,15], "src_2main_8cpp.html#a7df146b43e503e23146e698154d5096d":[17,0,0,1,4,16], +"src_2main_8cpp.html#a7e2a1df7cd48d187bff6438702063856":[17,0,0,1,4,20], "src_2main_8cpp.html#a8bd22523fa85c7cdc0b1ce2ca2ad9340":[17,0,0,1,4,3], "src_2main_8cpp.html#a9074d493ccf55d0cfa3acd2d173f665a":[17,0,0,1,4,18], "src_2main_8cpp.html#a974c70ac5c2f6156bf0e7fafd973d803":[17,0,0,1,4,37], diff --git a/search/all_b.js b/search/all_b.js index 1463f50..ad9b888 100644 --- a/search/all_b.js +++ b/search/all_b.js @@ -12,7 +12,7 @@ var searchData= ['mqtt_20lora_20wifi_20telemetry_20selection_9',['XBEE, MQTT, LORA, WIFI telemetry selection',['../index.html#step8',1,'']]], ['mqtt_5fcommand_5fprocessor_10',['mqtt_command_processor',['../src_2main_8cpp.html#ac8f8ce86c72ef32a58022e6bba898099',1,'main.cpp']]], ['mqtt_5fport_11',['MQTT_PORT',['../defs_8h.html#aa8632baff6bbb5004385998918f1e6bd',1,'defs.h']]], - ['mqtt_5freconnect_12',['MQTT_Reconnect',['../src_2main_8cpp.html#a5a48a88cefb37379fe58c0f58d0c274f',1,'main.cpp']]], + ['mqtt_5freconnect_12',['MQTT_Reconnect',['../src_2main_8cpp.html#a7e2a1df7cd48d187bff6438702063856',1,'main.cpp']]], ['mqtt_5ftopic_5flength_13',['MQTT_TOPIC_LENGTH',['../defs_8h.html#a237252f3f1f9d37812d9ec005e3a3d6a',1,'defs.h']]], ['mqtt_5ftransmittelemetry_14',['MQTT_TransmitTelemetry',['../src_2main_8cpp.html#a623ea109418725f80cfc705f49fd7a55',1,'main.cpp']]], ['mqttinit_15',['MQTTInit',['../src_2main_8cpp.html#a582e3dadcae4266158f0516e7c264bb6',1,'main.cpp']]] diff --git a/search/functions_9.js b/search/functions_9.js index f3e4e04..16e5a98 100644 --- a/search/functions_9.js +++ b/search/functions_9.js @@ -2,7 +2,7 @@ var searchData= [ ['mainchutedeploy_0',['mainChuteDeploy',['../src_2main_8cpp.html#a9074d493ccf55d0cfa3acd2d173f665a',1,'main.cpp']]], ['mqtt_5fcommand_5fprocessor_1',['mqtt_command_processor',['../src_2main_8cpp.html#ac8f8ce86c72ef32a58022e6bba898099',1,'main.cpp']]], - ['mqtt_5freconnect_2',['MQTT_Reconnect',['../src_2main_8cpp.html#a5a48a88cefb37379fe58c0f58d0c274f',1,'main.cpp']]], + ['mqtt_5freconnect_2',['MQTT_Reconnect',['../src_2main_8cpp.html#a7e2a1df7cd48d187bff6438702063856',1,'main.cpp']]], ['mqtt_5ftransmittelemetry_3',['MQTT_TransmitTelemetry',['../src_2main_8cpp.html#a623ea109418725f80cfc705f49fd7a55',1,'main.cpp']]], ['mqttinit_4',['MQTTInit',['../src_2main_8cpp.html#a582e3dadcae4266158f0516e7c264bb6',1,'main.cpp']]] ]; diff --git a/src_2main_8cpp.html b/src_2main_8cpp.html index 65b23af..21758ce 100644 --- a/src_2main_8cpp.html +++ b/src_2main_8cpp.html @@ -268,10 +268,10 @@ void MQTT_TransmitTelemetry (void *pvParameters)  send flight data to ground
  - -void MQTT_Reconnect () - Try reconnecting to MQTT if connection is lost.
-  + +void MQTT_Reconnect (void *pvParameters) + Try reconnecting to MQTT if connection is lost.
+  void mqtt_Callback (char *topic, byte *payload, unsigned int length)   @@ -332,6 +332,9 @@ bool buzz_state = 0   + +uint8_t mqtt_connect_flag +  uint8_t SUBSYSTEM_INIT_MASK = 0b00000000   diff --git a/src_2main_8cpp.js b/src_2main_8cpp.js index 9077397..df76107 100644 --- a/src_2main_8cpp.js +++ b/src_2main_8cpp.js @@ -23,7 +23,7 @@ var src_2main_8cpp = [ "loop", "src_2main_8cpp.html#afe461d27b9c48d5921c00d521181f12f", null ], [ "mainChuteDeploy", "src_2main_8cpp.html#a9074d493ccf55d0cfa3acd2d173f665a", null ], [ "mqtt_command_processor", "src_2main_8cpp.html#ac8f8ce86c72ef32a58022e6bba898099", null ], - [ "MQTT_Reconnect", "src_2main_8cpp.html#a5a48a88cefb37379fe58c0f58d0c274f", null ], + [ "MQTT_Reconnect", "src_2main_8cpp.html#a7e2a1df7cd48d187bff6438702063856", null ], [ "MQTT_TransmitTelemetry", "src_2main_8cpp.html#a623ea109418725f80cfc705f49fd7a55", null ], [ "MQTTInit", "src_2main_8cpp.html#a582e3dadcae4266158f0516e7c264bb6", null ], [ "non_blocking_buzz", "src_2main_8cpp.html#a30f4f18cd44f30af314ac53e31f4b1dd", null ], diff --git a/system__logger_8h_source.html b/system__logger_8h_source.html index 1812272..acbecd8 100644 --- a/system__logger_8h_source.html +++ b/system__logger_8h_source.html @@ -126,7 +126,7 @@
SystemLogger::readLogFile
void readLogFile(fs::FS &fs, const char *file)
read log file to console
Definition system_logger.cpp:73
SystemLogger::logToFile
void logToFile(fs::FS &fs, uint8_t mode, const char *client, uint8_t log_level, const char *file, const char *msg)
write event logs to file
Definition system_logger.cpp:13
SystemLogger::getLogLevelString
const char * getLogLevelString(uint8_t log_level)
convert the log level to string
Definition system_logger.cpp:95
-
file
SerialFlashFile file
Definition main.cpp:142
+
file
SerialFlashFile file
Definition main.cpp:144
system_log_levels.h