commit 4d67606a06325003ad9fca885ca86b89a350db27 Author: Fisch Date: Sat Apr 6 11:57:15 2019 +0200 working with udp diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..485bd1a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +wificredentials.h \ No newline at end of file diff --git a/lichtorgel.ino b/lichtorgel.ino new file mode 100644 index 0000000..9fe5c88 --- /dev/null +++ b/lichtorgel.ino @@ -0,0 +1,135 @@ +//echo -n "110010" >/dev/udp/192.168.178.25/4210 + +//Node MCU 1.0 ESP-12E +//1M SPIFFS +//80MHz + + +#include +#include + +#include "wificredentials.h" +/* content: + * const char* ssid = "SSIDHERE"; + * const char* password = "password"; + */ + +WiFiUDP Udp; +unsigned int localUdpPort = 4210; // local port to listen on +char incomingPacket[255]; // buffer for incoming packets +bool wlan=true; + +#define PIN_SR_DATA D5 +#define PIN_SR_LTCH D6 +#define PIN_SR_CLOCK D7 + +#define OUTPUTS 6 + +long lastTickMillis; + +uint8_t out[OUTPUTS]; + +long lastChange=0; +#define STANDBYTIME 5000 //time in ms after lamps switch off if nothing happened +boolean standby=false; + +void setup() +{ + pinMode(PIN_SR_DATA, OUTPUT); + pinMode(PIN_SR_LTCH, OUTPUT); + pinMode(PIN_SR_CLOCK, OUTPUT); + + shiftRelais(0); + + Serial.begin(115200); + Serial.println(); + + + Serial.printf("Connecting to %s ", ssid); + WiFi.begin(ssid, password); + uint8_t wlantries=20; + while ((WiFi.status() != WL_CONNECTED) && wlan) + { + delay(500); + Serial.print("."); + if (wlantries<=0){ + wlan=false; //deactivate wlan + } + wlantries--; + } + + + if(wlan){ + Serial.println(" connected"); + Udp.begin(localUdpPort); + Serial.printf("Now listening at IP %s, UDP port %d\n", WiFi.localIP().toString().c_str(), localUdpPort); + }else{ + Serial.println("wlan not connected"); + } +} + + +void loop() +{ + int packetSize = Udp.parsePacket(); + if (packetSize) + { + // receive incoming UDP packets + Serial.printf("Received %d bytes from %s, port %d\n", packetSize, Udp.remoteIP().toString().c_str(), Udp.remotePort()); + int len = Udp.read(incomingPacket, 255); + if (len > 0) + { + incomingPacket[len] = 0; + } + uint16_t data=incomingPacket[0]<<8 | incomingPacket[1]; + + Serial.printf("UDP packet contents: %s\n", incomingPacket); + + printBinary(data); + printBinary(mapData(data)); + shiftRelais(mapData(data)); + + lastChange=millis(); + standby=false; + } + + if (millis()-lastChange >=STANDBYTIME && !standby){ + Serial.println("Standby"); + shiftRelais(mapData(0)); + standby=true; + } + +} + +void printBinary(uint16_t value){ + for(int i = 15; i >=0; i--) { + Serial.print((value & (1 << ((byte)i) )) ? 1 : 0); + //Serial.print(!!(value & (1 << i))); //this should also work + } + Serial.println(); +} + +uint16_t mapData(uint16_t x){ + uint16_t d=0; + d|=moveByte(x,0,1); + d|=moveByte(x,1,2); + d|=moveByte(x,2,3); + d|=moveByte(x,3,4); + d|=moveByte(x,4,5); + d|=moveByte(x,5,6); + d|=moveByte(x,6,7); + d|=moveByte(x,7,0); + return d; +} + +uint16_t moveByte(uint16_t x,uint8_t from,uint8_t to){ + //example: x=00110101 from=2 to=0 -> 00000001 + return ((x&_BV(from))>0) ? _BV(to):0; +} + +void shiftRelais(uint16_t data) { + digitalWrite(PIN_SR_LTCH, LOW); + shiftOut(PIN_SR_DATA, PIN_SR_CLOCK, MSBFIRST, (data >> 8)); + shiftOut(PIN_SR_DATA, PIN_SR_CLOCK, MSBFIRST, data & 0xff); + digitalWrite(PIN_SR_LTCH, HIGH); +} diff --git a/sender.py b/sender.py new file mode 100644 index 0000000..e1e78e1 --- /dev/null +++ b/sender.py @@ -0,0 +1,47 @@ +import socket +import time +import random + +UDP_IP = "192.168.178.31" +#UDP_PORT = 4210 +#UDP_IP = "195.160.169.73" +UDP_PORT = 4210 + + +print("UDP target IP:", UDP_IP) +print("UDP target port:", UDP_PORT) + +sock = socket.socket(socket.AF_INET, # Internet + socket.SOCK_DGRAM) # UDP + +def setLights(outputsB,outputsA): + + message=chr(int(outputsB, 2))+chr(int(outputsA, 2)) + sock.sendto(message.encode(), (UDP_IP, UDP_PORT)) + +setLights("00000000","00000000") #00000000 00000001 -> erster port (orange). .. 00100000 -> 6. port + + +time.sleep(1) +setLights("00000000","00000001") +time.sleep(1) +setLights("00000000","00000010") +time.sleep(1) +setLights("00000000","00000100") +time.sleep(1) +setLights("00000000","00001000") +time.sleep(1) +setLights("00000000","00010000") +time.sleep(1) +setLights("00000000","00100000") + +time.sleep(1) +setLights("00000000","00000000") + + + +while True: + outA="00000000" + outB=bin(random.randint(0,1)+random.randint(0,1)*2+random.randint(0,1)*4+random.randint(0,1)*8+random.randint(0,1)*16+random.randint(0,1)*32) + setLights(outA,outB) + time.sleep(0.5)