JSD/TinyGSM_Senseright
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rewrote XBeeType as an enum, which seems to work much better

Browse Source
This commit is contained in:
SRGDamia1
2017-06-07 17:11:20 -04:00
parent 8a49f72f19
commit 4cbdd941cb
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
TinyGsmClientXBee.h
View File

@@ -27,6 +27,11 @@ enum SimStatus {
SIM_LOCKED = 2, SIM_LOCKED = 2,
}; };
enum XBeeType {
S6B = 0,
LTEC1 = 1,
};
enum RegStatus { enum RegStatus {
REG_UNREGISTERED = 0, REG_UNREGISTERED = 0,
REG_SEARCHING = 2, REG_SEARCHING = 2,
@@ -160,14 +165,14 @@ public:
sendAT(GF("GT64")); // shorten the guard time to 100ms sendAT(GF("GT64")); // shorten the guard time to 100ms
waitResponse(); waitResponse();
writeChanges(); writeChanges();
sendAT(GF("HS")); // Get the Hardware series; 0x601 for S6B (Wifi) sendAT(GF("HS")); // Get the "Hardware Series"; 0x601 for S6B (Wifi)
// wait for the response // wait for the response
unsigned long startMillis = millis(); unsigned long startMillis = millis();
while (!stream.available() && millis() - startMillis < 1000) {}; while (!stream.available() && millis() - startMillis < 1000) {};
String res = streamReadUntil('\r'); // Does not send an OK, just the result String res = streamReadUntil('\r'); // Does not send an OK, just the result
exitCommand(); exitCommand();
if (res == "601") series = "WIFI"; if (res == "601") beeType = S6B;
else series = "CELL"; else beeType = LTEC1;
guardTime = 125; guardTime = 125;
return true; return true;
} }
@@ -250,8 +255,8 @@ public:
int getSignalQuality() { int getSignalQuality() {
commandMode(); commandMode();
if (series == "WIFI") sendAT(GF("LM")); if (beeType == S6B) sendAT(GF("LM")); // ask for the "link margin" - the dB above sensitivity
else sendAT(GF("DB")); else sendAT(GF("DB")); // ask for the cell strenght in dBm
// wait for the response // wait for the response
unsigned long startMillis = millis(); unsigned long startMillis = millis();
while (!stream.available() && millis() - startMillis < 1000) {}; while (!stream.available() && millis() - startMillis < 1000) {};
@@ -261,7 +266,8 @@ public:
DBG(buf, "\n"); DBG(buf, "\n");
exitCommand(); exitCommand();
int intr = strtol(buf, 0, 16); int intr = strtol(buf, 0, 16);
return intr; if (beeType == S6B) return -93 + intr; // the maximum sensitivity is -93dBm
else return -1*intr; // need to convert to negative number
} }
SimStatus getSimStatus(unsigned long timeout = 10000L) { SimStatus getSimStatus(unsigned long timeout = 10000L) {
@@ -270,7 +276,7 @@ public:
RegStatus getRegistrationStatus() { RegStatus getRegistrationStatus() {
commandMode(); commandMode();
if (series == "WIFI") sendAT(GF("AI")); if (beeType == S6B) sendAT(GF("AI"));
else sendAT(GF("CI")); else sendAT(GF("CI"));
// wait for the response // wait for the response
unsigned long startMillis = millis(); unsigned long startMillis = millis();
@@ -309,7 +315,7 @@ public:
bool waitForNetwork(unsigned long timeout = 60000L) { bool waitForNetwork(unsigned long timeout = 60000L) {
for (unsigned long start = millis(); millis() - start < timeout; ) { for (unsigned long start = millis(); millis() - start < timeout; ) {
commandMode(); commandMode();
if (series == "WIFI") sendAT(GF("AI")); if (beeType == S6B) sendAT(GF("AI"));
else sendAT(GF("CI")); else sendAT(GF("CI"));
// wait for the response // wait for the response
unsigned long startMillis = millis(); unsigned long startMillis = millis();
@@ -519,7 +525,7 @@ private:
bool modemGetConnected(uint8_t mux = 1) { bool modemGetConnected(uint8_t mux = 1) {
commandMode(); commandMode();
if (series == "WIFI") sendAT(GF("AI")); if (beeType == S6B) sendAT(GF("AI"));
else sendAT(GF("CI")); else sendAT(GF("CI"));
int res = waitResponse(GF("0")); int res = waitResponse(GF("0"));
exitCommand(); exitCommand();
@@ -576,7 +582,7 @@ private:
private: private:
int guardTime; int guardTime;
String series; XBeeType beeType;
Stream& stream; Stream& stream;
GsmClient* sockets[1]; GsmClient* sockets[1];
}; };