1
0
mirror of https://github.com/Luzifer/espsms.git synced 2024-09-19 09:42:56 +00:00

Apply clang-format

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

View File

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

View File

@ -1,8 +1,9 @@
#include "main.hpp"
#include <Arduino.h>
#include <WiFi.h>
#include "http.hpp"
#include "main.hpp"
#include "modem.hpp"
#include "timer.h"
#include "timerManager.h"
@ -11,7 +12,7 @@
#define MODEM_DEBUG
// Set serial for AT commands (to SIM800 module)
#define SerialAT Serial1
#define SerialAT Serial1
void checkNet() {
String csq = sendCommand("AT+CSQ", true);
@ -122,8 +123,6 @@ void loop() {
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: ")) {
String message = readLine();
@ -138,7 +137,8 @@ void loop() {
pos = npos + 1;
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");
}
}
@ -146,15 +146,13 @@ void loop() {
TimerManager::instance().update();
}
String readLine() {
return readLine(0);
}
String readLine() { return readLine(0); }
String readLine(int timeout) {
String response = "";
int start = millis();
while(true) {
while (true) {
while (!SerialAT.available()) {
delay(10);
@ -214,28 +212,18 @@ String sendCommand(String command, bool readOK) {
void setup() {
Serial.begin(9600);
delay(2000); // Give terminal chance to connect
delay(2000); // Give terminal chance to connect
initWiFi();
initModem();
}
String trimQuotes(String in) {
while(in.startsWith("\"")) {
while (in.startsWith("\"")) {
in = in.substring(1);
}
while(in.endsWith("\"")) {
while (in.endsWith("\"")) {
in = in.substring(0, in.length() - 1);
}
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
}
}

View File

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

View File

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