Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Staging #162

Merged
merged 5 commits into from
Mar 13, 2024
Merged

Staging #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
56d00d9
minor output fixes and main code updated (CR3)
mhamidjamil Jan 8, 2024
fbbc193
BLE timeout added, SPIFFS rework for string values
mhamidjamil Feb 11, 2024
cc1afd4
Merge branch 'develop' into staging
mhamidjamil Feb 12, 2024
29b516f
update spiffs variable update functionality
mhamidjamil Mar 2, 2024
ab69f63
HEX company messages will no more forwarded
mhamidjamil Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 8 additions & 21 deletions TTgo_T-Call_ESP32_Module_Project.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//$ last work 08/Jan/24 [06:20 PM]
//$ last work 08/Jan/24 [07:32 PM]
// # version 5.6.8.5 major rework need to deploy in staging
// # Release Note: Rework: Communication with orange pi
// # message package_expiry_date rework, minor output fix
// # message package_expiry_date rework, Comments resolved

#include "arduino_secrets.h"

Expand Down Expand Up @@ -156,7 +156,6 @@ bool wifi_working = true;
bool display_working = true;
bool sms_allowed = false;
int package_expiry_date = 0;
bool connected_with_pi = false;
// 10921 => 09 = month, 21 = day

String messageTemplate = "#setting <ultra sound alerts 0> <display 1> <wifi "
Expand All @@ -173,7 +172,7 @@ String BLE_Output = "";
// bool batteriesCharged = false;

String ret_string = "";
String OWNER_NAME = "M Hamid Jamil";
String OWNER_NAME = DEVELOPER;
String error_codes = "";
// String chargingStatus = "";
// these error codes will be moving in the last row of lcd
Expand Down Expand Up @@ -811,13 +810,12 @@ void terminateLastMessage() {
String(current_target_index) + "} message : [ " +
removeNewline(_message_) + " ] from: {" + mobileNumber +
"} Removing it from stack so it don't disturb you !");
// TODO: add this message to orange-pi:
toOrangePi("untrained_sender:" + removeNewline(_message_) +
" from : {_" + mobileNumber + "_}<_" +
String(current_target_index) + "_>");
Delay(600);
} else if (!companyMsg(mobileNumber) &&
mobileNumber.indexOf("3374888420") != -1) {
mobileNumber.indexOf("3374888420") == -1) {
// if its neither company nor self message
sendSMS("#Unable to execute previous sms no. {" +
String(current_target_index) + "} message : [ " +
Expand Down Expand Up @@ -1272,7 +1270,7 @@ void wait(unsigned int miliSeconds) {

void setTime(String timeOfMessage) {
// +CMGL: 1,"REC READ","+923374888420","","23/08/14,17:21:05+20"
rtc = fetchDetails(timeOfMessage, "\"24/", "\"", 1); // FIXME: Static year
rtc = fetchDetails(timeOfMessage, "\"" + String(myRTC.year) + "/", "\"", 1);
println(
"\n+++++++++++++++++++++++++++++++++++++++++++\n Fetched data from : " +
timeOfMessage + "\nFinal data : " + rtc +
Expand Down Expand Up @@ -1539,7 +1537,8 @@ void inputManager(String command, int inputFrom) {
} else if ((command.indexOf("check sms sending") != -1) ||
(command.indexOf("sms sending?") != -1)) {
sms_allowed = hasPackage();
println("SMS sending is " + sms_allowed ? "allowed!" : "not allowed!");
println(String("SMS sending is ") +
(sms_allowed ? "allowed!" : "not allowed!"));
} else if (command.indexOf("py_time:") != -1) {
println("***Received time from terminal setting up time...");
rtc = command.substring(command.indexOf("py_time:") + 8, -1);
Expand Down Expand Up @@ -2119,15 +2118,7 @@ void setField_MonthAndDate(int *field, int *month, int *date, int *year) {
Println(7, "From field " + String(*field) +
" => Month : " + String(*month) +
" Date : " + String(*date) + " Year: " + String(*year));
}
// else if (field == 0 && month != 0 && date != 0) {
// field = 10000 + month * 100 + date;
// Println(7, "From Month : " + String(month) + " & Date : " +
// String(date)
// +
// " => field : " + String(field));
// }
else {
} else {
rise("Error in setField_MonthAndDate function! here is the "
"data function received: field: " +
String(*field) + " month: " + String(*month) +
Expand Down Expand Up @@ -2460,10 +2451,6 @@ String getRTC_Time() {
}

void updateOnlineTime(String formattedDate) {
// sscanf(formattedDate.c_str(), "%d-%d-%dT%d:%d:%dZ", myRTC.year,
// myRTC.month,
// myRTC.date, myRTC.hour, myRTC.minutes, myRTC.seconds);
// myRTC.year = myRTC.year % 100;
myRTC.year = formattedDate.substring(0, 4).toInt() % 100;
myRTC.month = formattedDate.substring(5, 7).toInt();
myRTC.date = formattedDate.substring(8, 10).toInt();
Expand Down
Loading