luzifer/espsms
1
0
Fork 0
mirror of https://github.com/Luzifer/espsms.git synced 2024-12-20 18:01:22 +00:00
Code Issues Releases Wiki Activity

Apply clang-format

Browse source
This commit is contained in:
Knut Ahlers 2020-07-19 17:44:56 +02:00
parent 85deb7e285
commit 989383b00b
Signed by: luzifer
GPG key ID: DC2729FDD34BE99E
4 changed files with 19 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/http.cpp
View file

@ -1,8 +1,8 @@
#include "http.hpp"
#include <ArduinoJson.h> #include <ArduinoJson.h>
#include <HTTPClient.h> #include <HTTPClient.h>
#include "http.hpp"
HTTPClient http; HTTPClient http;
bool sendMessage(String from, String fromName, String date, String message) { bool sendMessage(String from, String fromName, String date, String message) {

32
src/main.cpp
View file

@ -1,8 +1,9 @@
#include "main.hpp"
#include <Arduino.h> #include <Arduino.h>
#include <WiFi.h> #include <WiFi.h>
#include "http.hpp" #include "http.hpp"
#include "main.hpp"
#include "modem.hpp" #include "modem.hpp"
#include "timer.h" #include "timer.h"
#include "timerManager.h" #include "timerManager.h"
@ -11,7 +12,7 @@
#define MODEM_DEBUG #define MODEM_DEBUG
// Set serial for AT commands (to SIM800 module) // Set serial for AT commands (to SIM800 module)
#define SerialAT Serial1 #define SerialAT Serial1
void checkNet() { void checkNet() {
String csq = sendCommand("AT+CSQ", true); String csq = sendCommand("AT+CSQ", true);
@ -122,8 +123,6 @@ void loop() {
Serial.println("ERR: " + line); Serial.println("ERR: " + line);
} }
// DBG: Received +CMT: "+49157***","","20/07/19,12:57:45+08"
// DBG: Received Sehr lange SMS um zu demonstrieren wie sich der Kram verh<72>lt wenn sowohl Sonderzeichen als auch viel Text in der Nachricht stecken
if (line.startsWith("+CMT: ")) { if (line.startsWith("+CMT: ")) {
String message = readLine(); String message = readLine();
@ -138,7 +137,8 @@ void loop() {
pos = npos + 1; pos = npos + 1;
String date = line.substring(pos); String date = line.substring(pos);
if (!sendMessage(trimQuotes(senderNo), trimQuotes(senderName), trimQuotes(date), iso88591ToUTF8(message))) { if (!sendMessage(trimQuotes(senderNo), trimQuotes(senderName),
trimQuotes(date), iso88591ToUTF8(message))) {
Serial.println("ERR: Unable to submit message"); Serial.println("ERR: Unable to submit message");
} }
} }
@ -146,15 +146,13 @@ void loop() {
TimerManager::instance().update(); TimerManager::instance().update();
} }
String readLine() { String readLine() { return readLine(0); }
return readLine(0);
}
String readLine(int timeout) { String readLine(int timeout) {
String response = ""; String response = "";
int start = millis(); int start = millis();
while(true) { while (true) {
while (!SerialAT.available()) { while (!SerialAT.available()) {
delay(10); delay(10);
@ -214,28 +212,18 @@ String sendCommand(String command, bool readOK) {
void setup() { void setup() {
Serial.begin(9600); Serial.begin(9600);
delay(2000); // Give terminal chance to connect delay(2000); // Give terminal chance to connect
initWiFi(); initWiFi();
initModem(); initModem();
} }
String trimQuotes(String in) { String trimQuotes(String in) {
while(in.startsWith("\"")) { while (in.startsWith("\"")) {
in = in.substring(1); in = in.substring(1);
} }
while(in.endsWith("\"")) { while (in.endsWith("\"")) {
in = in.substring(0, in.length() - 1); in = in.substring(0, in.length() - 1);
} }
return in; return in;
} }
void updateSerial() {
delay(500);
while (Serial.available()) {
SerialAT.write(Serial.read());//Forward what Serial received to Software Serial Port
}
while(SerialAT.available()) {
Serial.write(SerialAT.read());//Forward what Software Serial received to Serial Port
}
}

1
src/main.hpp
View file

@ -18,6 +18,5 @@ String readLine(int timeout);
bool sendBoolCommand(String command); bool sendBoolCommand(String command);
String sendCommand(String command, bool readOK); String sendCommand(String command, bool readOK);
String trimQuotes(String in); String trimQuotes(String in);
void updateSerial();
#endif #endif

14
src/modem.hpp
View file

@ -1,8 +1,8 @@
// TTGO T-Call pins // TTGO T-Call pins
#define MODEM_RST 5 #define MODEM_RST 5
#define MODEM_PWKEY 4 #define MODEM_PWKEY 4
#define MODEM_POWER_ON 23 #define MODEM_POWER_ON 23
#define MODEM_TX 27 #define MODEM_TX 27
#define MODEM_RX 26 #define MODEM_RX 26
#define I2C_SDA 21 #define I2C_SDA 21
#define I2C_SCL 22 #define I2C_SCL 22