IT-Syndikat
/
ITSynOpen
Archived
13
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Run clang-format, add config

This commit is contained in:
Xiretza 2022-08-16 20:24:24 +02:00
parent 0c468f3e4f
commit b06c799e21
2 changed files with 174 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ITS_Open_direct_2fb/.clang-format Normal file
View File

@ -0,0 +1 @@
BasedOnStyle: Chromium

102
ITS_Open_direct_2fb/ITS_Open_direct_2fb.ino
View File

@ -12,14 +12,14 @@ Example sketches from Arduino team, Ethernet by Adrian McEwen
Based on the Ethernet to Thingspeak exaple by Hans Scharler
*/
#include <SPI.h>
#include <Ethernet.h>
#include <SPI.h>
#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;
@ -57,8 +57,7 @@ const int tclose = 3;
const int beeper = A5;
void setLeds() {
if (pingtimer>=0)
{
if (pingtimer >= 0) {
if (hsopen) { // If space is not closed, beep three times with
// beep
if ((pingtimer > 220) && ((pingtimer / 5) % 2 == 1)) {
@ -101,7 +100,8 @@ void setLeds(){
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(glight, 255 - (255 / (ledspan / 2) *
(ledtimer - (ledspan / 2)))); // fade down
}
analogWrite(rlight, 0);
break;
@ -128,7 +128,8 @@ void setLeds(){
analogWrite(rlight, tmp); // fade up
} else {
int tmp = 255-(255/(ledspan/2)*(ledtimer-(ledspan/2)));
int tmp =
255 - (255 / (ledspan / 2) * (ledtimer - (ledspan / 2)));
analogWrite(glight, tmp); // fade down
analogWrite(rlight, tmp); // fade down
}
@ -139,7 +140,9 @@ void setLeds(){
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(rlight,
255 - (255 / (ledspan / 2) *
(ledtimer - (ledspan / 2)))); // fade down
}
analogWrite(glight, 0);
break;
@ -178,8 +181,7 @@ void setRoom(int statuss){
setLeds();
}
void startEthernet()
{
void startEthernet() {
client.stop();
if (debug) {
Serial.println("Connecting Arduino to network...");
@ -189,16 +191,13 @@ void startEthernet()
delay(1000);
// Connect to network amd obtain an IP address using DHCP
if (Ethernet.begin(mac) == 0)
{
if (Ethernet.begin(mac) == 0) {
if (debug) {
Serial.println("DHCP Failed, reset Arduino to try again");
Serial.println();
}
setEth(0);
}
else
{
} else {
if (debug) {
Serial.println("Arduino connected to network using DHCP");
Serial.println();
@ -225,26 +224,34 @@ 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 (debug) {
Serial.println("##END OF HEADER##");
}
}
}
if (readStatus) {
if (currentLine.startsWith("true", 0)) {
if(debug){Serial.println("");}
if (debug) {
Serial.println("");
}
switch (mode) {
case 0:
setRoom(1);
break;
case 1:
if(debug){Serial.println("Wink Wink");}
if (debug) {
Serial.println("Wink Wink");
}
pingtimer = pingspan;
break;
}
@ -253,13 +260,17 @@ void readServerStatus(int mode) {
return;
}
if (currentLine.startsWith("false", 0)) {
if(debug){Serial.println("");}
if (debug) {
Serial.println("");
}
switch (mode) {
case 0:
setRoom(0);
break;
case 1:
if(debug){Serial.println("No Wink");}
if (debug) {
Serial.println("No Wink");
}
break;
}
// close the connection to the server:
@ -267,7 +278,8 @@ void readServerStatus(int mode) {
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,9 +290,13 @@ 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("HOST: " SERVER_DOMAIN);
@ -288,7 +304,9 @@ void TriggerServerReq(String s, int mode) {
client.println();
readServerStatus(mode);
} else {
if(debug){Serial.println("Not connected...");}
if (debug) {
Serial.println("Not connected...");
}
}
// note the time of this connect attempt:
}
@ -299,9 +317,7 @@ void RequestState() {
// Status LED pins
void setup()
{
void setup() {
pinMode(glight, OUTPUT);
pinMode(rlight, OUTPUT);
pinMode(beeper, OUTPUT);
@ -334,18 +350,25 @@ 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");
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...");}
if (debug) {
Serial.println("Not connected...");
}
}
// note the time of this connect attempt:
}
@ -375,8 +398,7 @@ void launchUpdate(){
}
}
void loop()
{
void loop() {
readButtons();
launchUpdate();
}
@ -388,10 +410,16 @@ void readServerReturn() {
while (client.connected()) {
if (client.available()) {
char c = client.read();
if(debug){Serial.print(c);}
if (debug) {
Serial.print(c);
}
}
if(debug){Serial.println();}
if(debug){Serial.println("disconnecting.");}
}
if (debug) {
Serial.println();
}
if (debug) {
Serial.println("disconnecting.");
}
client.stop();
}