Skip to content

Commit

Permalink
Adding discord proxy compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
@smford
smford committed Jul 7, 2020
1 parent e9a1d4d commit 99fd3b7
Show file tree
Hide file tree
Showing 5 changed files with 182 additions and 102 deletions.
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ A simple ESP32 Based RFID Access Control System for tools or door.
- Metrics collected in influxdb/telegraf: system temp, access granted, wifi signal strength, and whether actual device being used (still to come)
- NTP Time synchronisation
- Support tls web api calls using json
- Integration with Discord - "Laser has been fired!" when laser is being used, or "!laser status" like commands to query the status of the device

## Pin Out

Expand Down
99 changes: 62 additions & 37 deletions configuration_functions.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,25 @@ void loadConfiguration(const char *filename, Config &config) {
config.telegrafshiptime = default_telegrafshiptime;
}

if (doc.containsKey("discordproxyenable")) {
config.discordproxyenable = doc["discordproxyenable"].as<bool>();
} else {
initiatesave = true;
config.discordproxyenable = default_discordproxyenable;
}

config.discordproxyserver = doc["discordproxyserver"].as<String>();
if (config.discordproxyserver == "null") {
initiatesave = true;
config.discordproxyserver = default_discordproxyserver;
}

config.discordproxyapitoken = doc["discordproxyapitoken"].as<String>();
if (config.discordproxyapitoken == "null") {
initiatesave = true;
config.discordproxyapitoken = default_discordproxyapitoken;
}

file.close();

if (initiatesave) {
Expand Down Expand Up @@ -318,6 +337,9 @@ void saveConfiguration(const char *filename, const Config &config) {
doc["telegrafserver"] = config.telegrafserver;
doc["telegrafserverport"] = config.telegrafserverport;
doc["telegrafshiptime"] = config.telegrafshiptime;
doc["discordproxyenable"] = config.discordproxyenable;
doc["discordproxyserver"] = config.discordproxyserver;
doc["discordproxyapitoken"] = config.discordproxyapitoken;

// Serialize JSON to file
if (serializeJson(doc, file) == 0) {
Expand Down Expand Up @@ -349,41 +371,44 @@ void printFile(const char *filename) {
}

void printConfig() {
Serial.print(" hostname: "); Serial.println(config.hostname);
Serial.print(" device: "); Serial.println(config.device);
Serial.print(" appname: "); Serial.println(config.appname);
Serial.print(" ssid: "); Serial.println(config.ssid);
Serial.print(" wifipassword: "); Serial.println("**********");
Serial.print(" relaypin: "); Serial.println(config.relaypin);
Serial.print(" ledpin: "); Serial.println(config.ledpin);
Serial.print(" httpuser: "); Serial.println(config.httpuser);
Serial.print(" httppassword: "); Serial.println("**********");
Serial.print(" httpapitoken: "); Serial.println("**********");
Serial.print(" syslogserver: "); Serial.println(config.syslogserver);
Serial.print(" syslogport: "); Serial.println(config.syslogport);
Serial.print(" inmaintenance: "); Serial.println(config.inmaintenance);
Serial.print(" ntptimezone: "); Serial.println(config.ntptimezone);
Serial.print(" ntpsynctime: "); Serial.println(config.ntpsynctime);
Serial.print(" ntpwaitsynctime: "); Serial.println(config.ntpwaitsynctime);
Serial.print(" ntpserver: "); Serial.println(config.ntpserver);
Serial.print("mfrcslaveselectpin: "); Serial.println(config.mfrcslaveselectpin);
Serial.print(" mfrcresetpin: "); Serial.println(config.mfrcresetpin);
Serial.print(" mfrccardwaittime: "); Serial.println(config.mfrccardwaittime);
Serial.print(" lcdi2caddress: "); Serial.println(config.lcdi2caddress);
Serial.print(" lcdwidth: "); Serial.println(config.lcdwidth);
Serial.print(" lcdheight: "); Serial.println(config.lcdheight);
Serial.print(" webserverporthttp: "); Serial.println(config.webserverporthttp);
Serial.print("webserverporthttps: "); Serial.println(config.webserverporthttps);
Serial.print(" webapiwaittime: "); Serial.println(config.webapiwaittime);
Serial.print(" webpagedelay: "); Serial.println(config.webpagedelay);
Serial.print(" serverurl: "); Serial.println(config.serverurl);
Serial.print(" serverapitoken: "); Serial.println("**********");
Serial.print(" checkuserpage: "); Serial.println(config.checkuserpage);
Serial.print(" getuserpage: "); Serial.println(config.getuserpage);
Serial.print(" moduserpage: "); Serial.println(config.moduserpage);
Serial.print(" overridecodes: "); Serial.println(config.overridecodes);
Serial.print(" telegrafenable: "); Serial.println(config.telegrafenable);
Serial.print(" telegrafserver: "); Serial.println(config.telegrafserver);
Serial.print("telegrafserverport: "); Serial.println(config.telegrafserverport);
Serial.print(" telegrafshiptime: "); Serial.println(config.telegrafshiptime);
Serial.print(" hostname: "); Serial.println(config.hostname);
Serial.print(" device: "); Serial.println(config.device);
Serial.print(" appname: "); Serial.println(config.appname);
Serial.print(" ssid: "); Serial.println(config.ssid);
Serial.print(" wifipassword: "); Serial.println("**********");
Serial.print(" relaypin: "); Serial.println(config.relaypin);
Serial.print(" ledpin: "); Serial.println(config.ledpin);
Serial.print(" httpuser: "); Serial.println(config.httpuser);
Serial.print(" httppassword: "); Serial.println("**********");
Serial.print(" httpapitoken: "); Serial.println("**********");
Serial.print(" syslogserver: "); Serial.println(config.syslogserver);
Serial.print(" syslogport: "); Serial.println(config.syslogport);
Serial.print(" inmaintenance: "); Serial.println(config.inmaintenance);
Serial.print(" ntptimezone: "); Serial.println(config.ntptimezone);
Serial.print(" ntpsynctime: "); Serial.println(config.ntpsynctime);
Serial.print(" ntpwaitsynctime: "); Serial.println(config.ntpwaitsynctime);
Serial.print(" ntpserver: "); Serial.println(config.ntpserver);
Serial.print(" mfrcslaveselectpin: "); Serial.println(config.mfrcslaveselectpin);
Serial.print(" mfrcresetpin: "); Serial.println(config.mfrcresetpin);
Serial.print(" mfrccardwaittime: "); Serial.println(config.mfrccardwaittime);
Serial.print(" lcdi2caddress: "); Serial.println(config.lcdi2caddress);
Serial.print(" lcdwidth: "); Serial.println(config.lcdwidth);
Serial.print(" lcdheight: "); Serial.println(config.lcdheight);
Serial.print(" webserverporthttp: "); Serial.println(config.webserverporthttp);
Serial.print(" webserverporthttps: "); Serial.println(config.webserverporthttps);
Serial.print(" webapiwaittime: "); Serial.println(config.webapiwaittime);
Serial.print(" webpagedelay: "); Serial.println(config.webpagedelay);
Serial.print(" serverurl: "); Serial.println(config.serverurl);
Serial.print(" serverapitoken: "); Serial.println("**********");
Serial.print(" checkuserpage: "); Serial.println(config.checkuserpage);
Serial.print(" getuserpage: "); Serial.println(config.getuserpage);
Serial.print(" moduserpage: "); Serial.println(config.moduserpage);
Serial.print(" overridecodes: "); Serial.println(config.overridecodes);
Serial.print(" telegrafenable: "); Serial.println(config.telegrafenable);
Serial.print(" telegrafserver: "); Serial.println(config.telegrafserver);
Serial.print(" telegrafserverport: "); Serial.println(config.telegrafserverport);
Serial.print(" telegrafshiptime: "); Serial.println(config.telegrafshiptime);
Serial.print(" discordproxyenable: "); Serial.println(config.discordproxyenable);
Serial.print(" discordproxyserver: "); Serial.println(config.discordproxyserver);
Serial.print("discordproxyapitoken: "); Serial.println("**********");
}
3 changes: 3 additions & 0 deletions defaults.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,6 @@ const bool default_telegrafenable = true;
const String default_telegrafserver = "192.168.10.21";
const int default_telegrafserverport = 8094;
const int default_telegrafshiptime = 30;
const bool default_discordproxyenable = true;
const String default_discordproxyserver = "http://192.168.10.21:57000";
const String default_discordproxyapitoken = "sometoken";
Loading

0 comments on commit 99fd3b7

Please sign in to comment.