From b9081c6e245fcff80a4150f484a091e652139e7b Mon Sep 17 00:00:00 2001 From: kutayboz Date: Mon, 12 Jun 2023 22:49:07 +0300 Subject: Finished network info publish routine --- include/bg96.h | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'include') diff --git a/include/bg96.h b/include/bg96.h index d6715f3..e6faebd 100644 --- a/include/bg96.h +++ b/include/bg96.h @@ -1,19 +1,17 @@ #ifndef __INCLUDE_BG96__ #define __INCLUDE_BG96__ -struct networkData { - char *operatorName; - char *currentTech; - char *networkRegStat; - char *trkAreaCode; - char *cellID; - char *rssi; - char *ber; -}; +#include -int initNetworkData(struct networkData *nD); +typedef struct networkDataTag { + char *operatorName, *networkName, *networkRegStat, *trkAreaCode, *cellID, + *tech, *band, *channel, *rssi, *rsrp, *sinr, *rsrq, *ber; + struct tm netTime; +} networkData; -int freeNetworkData(struct networkData *nD); +int initNetworkData(networkData *nD); + +int freeNetworkData(networkData *nD); int powerOn(char *pathToPort, char *pathToChip, int statusPin, int pwrKeyPin); @@ -28,8 +26,8 @@ int mqttDisc(char *pathToPort); int mqttConn(char *pathToPort, char *hostURL, int hostPort, char *username, char *password); -int mqttPub(char *pathToPort, char *topic, char *msg); +int mqttPubNetData(char *pathToPort, networkData nD); -int gatherData(struct networkData *output, char *pathToPort); +int gatherData(networkData *output, char *pathToPort); #endif -- cgit v1.3