From b06c799e219a5dea9d063ebb672cad3021f44c81 Mon Sep 17 00:00:00 2001 From: Xiretza Date: Tue, 16 Aug 2022 20:24:24 +0200 Subject: [PATCH] Run clang-format, add config --- ITS_Open_direct_2fb/.clang-format | 1 + ITS_Open_direct_2fb/ITS_Open_direct_2fb.ino | 318 +++++++++++--------- 2 files changed, 174 insertions(+), 145 deletions(-) create mode 100644 ITS_Open_direct_2fb/.clang-format diff --git a/ITS_Open_direct_2fb/.clang-format b/ITS_Open_direct_2fb/.clang-format new file mode 100644 index 0000000..3f19e61 --- /dev/null +++ b/ITS_Open_direct_2fb/.clang-format @@ -0,0 +1 @@ +BasedOnStyle: Chromium diff --git a/ITS_Open_direct_2fb/ITS_Open_direct_2fb.ino b/ITS_Open_direct_2fb/ITS_Open_direct_2fb.ino index 403b177..d6a4874 100644 --- a/ITS_Open_direct_2fb/ITS_Open_direct_2fb.ino +++ b/ITS_Open_direct_2fb/ITS_Open_direct_2fb.ino @@ -12,42 +12,42 @@ Example sketches from Arduino team, Ethernet by Adrian McEwen Based on the Ethernet to Thingspeak exaple by Hans Scharler */ -#include #include +#include #include "APIKey.h" #include "TimerOne.h" -byte mac[] = { 0xD4, 0xBA, 0xD9, 0x9A, 0x7C, 0x95 }; // Must be unique on local network - +// Must be unique on local network +byte mac[] = {0xD4, 0xBA, 0xD9, 0x9A, 0x7C, 0x95}; // Initialize Arduino Ethernet Client EthernetClient client; // Twitter response variables #define SERVER_DOMAIN "spaceapi.it-syndikat.org" // URL -String currentLine = ""; // string to hold the text from server +String currentLine = ""; // string to hold the text from server // Specific variables // Status int hsopen; int ethernetstatus; -int ledtimer =0; -const int ledspan =100; +int ledtimer = 0; +const int ledspan = 100; -int pingtimer =-1; -const int pingspan =250; +int pingtimer = -1; +const int pingspan = 250; int checktimer = 0; -const int checkspan =1000; +const int checkspan = 1000; int update = 0; -//debug options +// debug options boolean debug = true; -//LED and Switch pins +// LED and Switch pins const int glight = 5; const int rlight = 6; @@ -55,91 +55,94 @@ const int topen = 2; const int tclose = 3; const int beeper = A5; - -void setLeds(){ - if (pingtimer>=0) - { - if(hsopen){ // If space is not closed, beep three times with - //beep - if((pingtimer> 220)&&((pingtimer/5)%2 ==1)){ + +void setLeds() { + if (pingtimer >= 0) { + if (hsopen) { // If space is not closed, beep three times with + // beep + if ((pingtimer > 220) && ((pingtimer / 5) % 2 == 1)) { digitalWrite(beeper, HIGH); - }else{ + } else { digitalWrite(beeper, LOW); } - - }else{ // if closed, beep once - //beep - if((pingtimer> 240)&&((pingtimer/5)%2 ==1)){ + + } else { // if closed, beep once + // beep + if ((pingtimer > 240) && ((pingtimer / 5) % 2 == 1)) { digitalWrite(beeper, HIGH); - }else{ + } else { digitalWrite(beeper, LOW); } } // blink like crazy - if((pingtimer/2)%2 ==1){ + if ((pingtimer / 2) % 2 == 1) { analogWrite(rlight, 255); analogWrite(glight, 255); - }else{ + } else { analogWrite(rlight, 0); analogWrite(glight, 0); } pingtimer--; - }else{ - switch(ethernetstatus){ - case 0:{ // ethernet fail - //blink red - if(ledtimer < (ledspan/2)){ + } else { + switch (ethernetstatus) { + case 0: { // ethernet fail + // blink red + if (ledtimer < (ledspan / 2)) { analogWrite(rlight, 255); - }else{ + } else { analogWrite(rlight, 0); } analogWrite(glight, 0); break; } - case -1:{ // ethernet unknown + case -1: { // ethernet unknown // fade green - if(ledtimer < (ledspan/2)){ - analogWrite(glight, (255/(ledspan/2)*ledtimer));//fade up - }else{ - analogWrite(glight, 255-(255/(ledspan/2)*(ledtimer-(ledspan/2))));//fade down + if (ledtimer < (ledspan / 2)) { + analogWrite(glight, (255 / (ledspan / 2) * ledtimer)); // fade up + } else { + analogWrite(glight, 255 - (255 / (ledspan / 2) * + (ledtimer - (ledspan / 2)))); // fade down } analogWrite(rlight, 0); break; } - case 1:{ // ethernet ok - switch(hsopen){ - case 0:{ // closed - //red + case 1: { // ethernet ok + switch (hsopen) { + case 0: { // closed + // red analogWrite(rlight, 255); analogWrite(glight, 0); break; } - case 1:{ // open + case 1: { // open // green analogWrite(rlight, 0); analogWrite(glight, 255); break; } - case 2:{ // wait + case 2: { // wait // fade red and green - if(ledtimer < (ledspan/2)){ - int tmp=(255/(ledspan/2)*ledtimer); - analogWrite(glight, tmp);//fade up - analogWrite(rlight, tmp);//fade up + if (ledtimer < (ledspan / 2)) { + int tmp = (255 / (ledspan / 2) * ledtimer); + analogWrite(glight, tmp); // fade up + analogWrite(rlight, tmp); // fade up - }else{ - int tmp = 255-(255/(ledspan/2)*(ledtimer-(ledspan/2))); - analogWrite(glight, tmp);//fade down - analogWrite(rlight, tmp);//fade down + } else { + int tmp = + 255 - (255 / (ledspan / 2) * (ledtimer - (ledspan / 2))); + analogWrite(glight, tmp); // fade down + analogWrite(rlight, tmp); // fade down } break; } - case -1:{ // unknown + case -1: { // unknown // fade red - if(ledtimer < (ledspan/2)){ - analogWrite(rlight, (255/(ledspan/2)*ledtimer));//fade up - }else{ - analogWrite(rlight, 255-(255/(ledspan/2)*(ledtimer-(ledspan/2))));//fade down + if (ledtimer < (ledspan / 2)) { + analogWrite(rlight, (255 / (ledspan / 2) * ledtimer)); // fade up + } else { + analogWrite(rlight, + 255 - (255 / (ledspan / 2) * + (ledtimer - (ledspan / 2)))); // fade down } analogWrite(glight, 0); break; @@ -149,39 +152,38 @@ void setLeds(){ } } ledtimer++; - if ( ledtimer >= ledspan ) { + if (ledtimer >= ledspan) { ledtimer = 0; } } - checktimer++; - if ( checktimer >= checkspan ) { - checktimer = 0; - update=1; - } + checktimer++; + if (checktimer >= checkspan) { + checktimer = 0; + update = 1; + } } -void setEth(int statuss){ +void setEth(int statuss) { ethernetstatus = statuss; - if(debug){ + if (debug) { Serial.println("Setting eth "); Serial.println(statuss); } setLeds(); } -void setRoom(int statuss){ - hsopen= statuss; - if(debug){ +void setRoom(int statuss) { + hsopen = statuss; + if (debug) { Serial.print("Setting room "); Serial.println(statuss); } setLeds(); } -void startEthernet() -{ +void startEthernet() { client.stop(); - if(debug){ + if (debug) { Serial.println("Connecting Arduino to network..."); Serial.println(); } @@ -189,35 +191,32 @@ void startEthernet() delay(1000); // Connect to network amd obtain an IP address using DHCP - if (Ethernet.begin(mac) == 0) - { - if(debug){ + if (Ethernet.begin(mac) == 0) { + if (debug) { Serial.println("DHCP Failed, reset Arduino to try again"); Serial.println(); } setEth(0); - } - else - { - if(debug){ + } else { + if (debug) { Serial.println("Arduino connected to network using DHCP"); Serial.println(); } setEth(1); } - if(debug){ + if (debug) { Serial.println("DONE"); Serial.println(); } delay(1000); } -//reads out the status returned by the server and sets the LED's appropriately. -//the mode is defied by the intended call: +// reads out the status returned by the server and sets the LED's appropriately. +// the mode is defied by the intended call: void readServerStatus(int mode) { - char lastsign='0'; + char lastsign = '0'; boolean readStatus = false; - while(client.connected()) { + while (client.connected()) { if (client.available()) { // read incoming bytes: char inChar = client.read(); @@ -225,49 +224,62 @@ void readServerStatus(int mode) { // add incoming byte to end of line: currentLine += inChar; - if(debug){Serial.print(inChar);} + if (debug) { + Serial.print(inChar); + } // if you get a newline, clear the line: if (inChar == '\n') { currentLine = ""; - if(lastsign == '\n'){ // /r/n /r/n is the end of a header - readStatus= true; //start to parse the content of the line - if(debug){Serial.println("##END OF HEADER##");} + if (lastsign == '\n') { // /r/n /r/n is the end of a header + readStatus = true; // start to parse the content of the line + if (debug) { + Serial.println("##END OF HEADER##"); + } } } if (readStatus) { - if(currentLine.startsWith("true", 0)){ - if(debug){Serial.println("");} - switch(mode){ + if (currentLine.startsWith("true", 0)) { + if (debug) { + Serial.println(""); + } + switch (mode) { case 0: - setRoom(1); - break; + setRoom(1); + break; case 1: - if(debug){Serial.println("Wink Wink");} - pingtimer = pingspan; - break; + if (debug) { + Serial.println("Wink Wink"); + } + pingtimer = pingspan; + break; } // close the connection to the server: client.stop(); return; } - if(currentLine.startsWith("false", 0)){ - if(debug){Serial.println("");} - switch(mode){ + if (currentLine.startsWith("false", 0)) { + if (debug) { + Serial.println(""); + } + switch (mode) { case 0: - setRoom(0); - break; + setRoom(0); + break; case 1: - if(debug){Serial.println("No Wink");} - break; + if (debug) { + Serial.println("No Wink"); + } + break; } // close the connection to the server: client.stop(); return; } } - if (inChar != '\r') {// removes /r so we dan test if the header end with two newlines, hacky but works. + if (inChar != '\r') { // removes /r so we dan test if the header end with + // two newlines, hacky but works. lastsign = inChar; } } @@ -278,50 +290,54 @@ void readServerStatus(int mode) { void TriggerServerReq(String s, int mode) { // attempt to connect, and wait a millisecond: - if(debug){Serial.println("connecting to server... Status req");} + if (debug) { + Serial.println("connecting to server... Status req"); + } if (client.connect(SERVER_DOMAIN, 80)) { - if(debug){Serial.println("making HTTP request...");} + if (debug) { + Serial.println("making HTTP request..."); + } // make HTTP GET request to server: - client.println("GET "+ s +" HTTP/1.1"); + client.println("GET " + s + " HTTP/1.1"); client.println("HOST: " SERVER_DOMAIN); client.println("Connection: close"); client.println(); readServerStatus(mode); - }else{ - if(debug){Serial.println("Not connected...");} + } else { + if (debug) { + Serial.println("Not connected..."); + } } // note the time of this connect attempt: } void RequestState() { - TriggerServerReq("/api/status-s.php",0); + TriggerServerReq("/api/status-s.php", 0); } // Status LED pins -void setup() -{ - +void setup() { pinMode(glight, OUTPUT); pinMode(rlight, OUTPUT); - pinMode(beeper, OUTPUT); - digitalWrite(beeper,LOW); + pinMode(beeper, OUTPUT); + digitalWrite(beeper, LOW); // Buttons with pullup resistor pinMode(topen, INPUT); pinMode(tclose, INPUT); - digitalWrite(topen,HIGH); - digitalWrite(tclose,HIGH); + digitalWrite(topen, HIGH); + digitalWrite(tclose, HIGH); // Start Serial for debugging on the Serial Monitor - if(debug){ + if (debug) { Serial.begin(9600); } // Start Ethernet on Arduino setEth(-1); setRoom(2); - Timer1.initialize(20000); // 50 mal die Sekunde + Timer1.initialize(20000); // 50 mal die Sekunde Timer1.attachInterrupt(setLeds); startEthernet(); @@ -334,64 +350,76 @@ void setup() void TriggerServerUpdate(boolean stat) { // attempt to connect, and wait a millisecond: - if(debug){Serial.println("connecting to server... Update Req");} + if (debug) { + Serial.println("connecting to server... Update Req"); + } if (client.connect(SERVER_DOMAIN, 80)) { - if(debug){Serial.println("making HTTP request...");} + if (debug) { + Serial.println("making HTTP request..."); + } // make HTTP GET request to server: - String s =(stat?"true":"false"); - client.println("GET /api/update.php?open=" + s + "&apikey=" UPDATE_API_KEY + " HTTP/1.1"); + String s = (stat ? "true" : "false"); + client.println("GET /api/update.php?open=" + s + "&apikey=" UPDATE_API_KEY + + " HTTP/1.1"); client.println("HOST: " SERVER_DOMAIN); client.println("Connection: close"); client.println(); readServerStatus(0); - }else{ - if(debug){Serial.println("Not connected...");} + } else { + if (debug) { + Serial.println("Not connected..."); + } } // note the time of this connect attempt: } -void readButtons(){ - if((digitalRead(topen)==LOW)&&(hsopen!=1)){ - //startEthernet(); +void readButtons() { + if ((digitalRead(topen) == LOW) && (hsopen != 1)) { + // startEthernet(); setRoom(2); TriggerServerUpdate(true); } - if((digitalRead(tclose)==LOW)&&(hsopen!=0)){ - //startEthernet(); + if ((digitalRead(tclose) == LOW) && (hsopen != 0)) { + // startEthernet(); setRoom(2); TriggerServerUpdate(false); } } void RequestPing() { - TriggerServerReq("/api/ping-get.php?apikey=" PING_GET_API_KEY,1); + TriggerServerReq("/api/ping-get.php?apikey=" PING_GET_API_KEY, 1); } -void launchUpdate(){ - if(update==1){ +void launchUpdate() { + if (update == 1) { RequestPing(); RequestState(); update = 0; } } -void loop() -{ +void loop() { readButtons(); launchUpdate(); } -//This just reads the server return and logs it to the serial -// @deprecated +// This just reads the server return and logs it to the serial +//@deprecated void readServerReturn() { - //if(debug){Serial.println("readServerReturn ... ");} - while(client.connected()) { - if (client.available()) { - char c = client.read(); - if(debug){Serial.print(c);} - } - } - if(debug){Serial.println();} - if(debug){Serial.println("disconnecting.");} - client.stop(); + // if(debug){Serial.println("readServerReturn ... ");} + while (client.connected()) { + if (client.available()) { + char c = client.read(); + if (debug) { + Serial.print(c); + } + } + } + if (debug) { + Serial.println(); + } + if (debug) { + Serial.println("disconnecting."); + } + client.stop(); }