diff options
author | Oliwerix <oliwerix@gmail.com> | 2022-11-19 14:41:36 +0100 |
---|---|---|
committer | Oliwerix <oliwerix@gmail.com> | 2022-11-19 14:41:36 +0100 |
commit | 1e6f3846282112fb0b617f01361c4e77657be936 (patch) | |
tree | 11df6e14fe31a0d23bdd14043d8cb599b96d95ed /sw/dmx2artnet/src/main.cpp | |
parent | oliver2 pre-01 (diff) | |
parent | prazen fixture file (diff) | |
download | luč-1e6f3846282112fb0b617f01361c4e77657be936.tar luč-1e6f3846282112fb0b617f01361c4e77657be936.tar.gz luč-1e6f3846282112fb0b617f01361c4e77657be936.tar.bz2 luč-1e6f3846282112fb0b617f01361c4e77657be936.tar.lz luč-1e6f3846282112fb0b617f01361c4e77657be936.tar.xz luč-1e6f3846282112fb0b617f01361c4e77657be936.tar.zst luč-1e6f3846282112fb0b617f01361c4e77657be936.zip |
Diffstat (limited to '')
-rw-r--r-- | sw/dmx2artnet/src/main.cpp | 174 |
1 files changed, 80 insertions, 94 deletions
diff --git a/sw/dmx2artnet/src/main.cpp b/sw/dmx2artnet/src/main.cpp index 21ddd18..da5df4e 100644 --- a/sw/dmx2artnet/src/main.cpp +++ b/sw/dmx2artnet/src/main.cpp @@ -1,11 +1,12 @@ -#define DO_SLIP 1 -#define DO_WIFI 1 #include <Arduino.h> -#include <WiFiUdp.h> -#ifdef DO_WIFI #include <ESP8266WiFi.h> -#include <ESP8266WiFiMulti.h> -WiFiUDP u; +#define INT_RX D6 +#define SLIP Serial1 +// #undef SLIP +#ifdef SLIP +#define DEBUG(x) +#else +#define DEBUG(x) Serial1.println(x) #endif #define END 0xc0 #define ESC 0xdb @@ -23,7 +24,6 @@ struct artnet { uint8_t length_hi; uint8_t length_lo; unsigned char data[512]; // increase for fun - } __attribute__((packed)); struct udp { uint16_t srcport __attribute__((packed)); @@ -67,47 +67,39 @@ struct artnet_over_slip { struct artnet artnet; } __attribute__((packed)); struct artnet_over_slip p; -unsigned long č = 0; - -volatile unsigned w = 0; -/* volatile unsigned long last_fall = 0; -volatile unsigned long mark_after_break = 0; -volatile unsigned char led = 0; -// volatile unsigned send = 0; +unsigned n = 0; +volatile int interrupt = digitalPinToInterrupt(INT_RX); +volatile unsigned long last_fall = 0; +volatile unsigned led = 0; +volatile unsigned recording = 0; +unsigned long last_byte = 0; +unsigned long flash_hack = 0; +unsigned sent_packets = 0; IRAM_ATTR void isr () { - if (digitalRead(D6) == LOW) { - if (mark_after_break) { - // mark_after_break = 0; - // send = w-1; - // w = 0; - mark_after_break = w = 0; - -#ifndef DO_SLIP - digitalWrite(D4, led++ % 2); -#endif + if (digitalRead(INT_RX) == HIGH) { + if (last_fall && micros() - last_fall > 87) { + recording++; + while (Serial.available()) + Serial.read(); + last_byte = micros(); + n = 0; + detachInterrupt(interrupt); } + } else last_fall = micros(); - } else { - if (micros() - last_fall > 87) - mark_after_break++; - } -} */ - +} void setup () { - pinMode(D6, INPUT_PULLUP); + WiFi.mode(WIFI_OFF); + pinMode(D4, SPECIAL); + pinMode(INT_RX, INPUT); + pinMode(D5, INPUT_PULLUP); + pinMode(D3, INPUT_PULLUP); + if (digitalRead(D5) == LOW) + flash_hack++; Serial.begin(250000, SERIAL_8N2); Serial.swap(); -#ifdef DO_SLIP - Serial1.begin(/* MONITOR_SPEED */ 115200); -#else - pinMode(D4, OUTPUT); -#endif -#ifdef DO_WIFI - // WiFi.softAP("dmx2artnet", NULL, 11, 0, 8); - // WiFi.begin("OpenWrt", NULL); - WiFi.begin("Hell Patrol", WIFI_PW); - u.begin(6454); -#endif +#ifdef SLIP + Serial1.begin(115200); sprintf(p.artnet.name, "Art-Net"); p.artnet.opcode[0] = 0x00; p.artnet.opcode[1] = 0x50; @@ -117,7 +109,7 @@ void setup () { p.artnet.physical = 0; p.artnet.sub_uni = 0; p.artnet.net = 0; - if (digitalRead(D6) == LOW) + if (digitalRead(D3) == LOW) p.udp.srcport = p.udp.dstport = htons(6455); else p.udp.srcport = p.udp.dstport = htons(6454); @@ -132,17 +124,18 @@ void setup () { p.ip.src[2] = (ESP.getChipId() & 0xff00) >> 8; p.ip.src[3] = (ESP.getChipId() & 0xff); memset(p.ip.dst, 255, 4); - // attachInterrupt(digitalPinToInterrupt(D6), isr, CHANGE); +#else + Serial1.begin(MONITOR_SPEED); +#endif + attachInterrupt(interrupt, isr, CHANGE); } -unsigned char recording[sizeof p.artnet.data * 2]; -#ifdef DO_SLIP +#ifdef SLIP char slip_buf[sizeof p * 2 + 1]; unsigned slip_off = 0; unsigned slip_len = 0; #endif -#define SLIP Serial1 -void loop () { -#ifdef DO_SLIP +void loop() { +#ifdef SLIP unsigned avail = SLIP.availableForWrite(); if (slip_off < slip_len && avail) { if (avail > slip_len-slip_off) @@ -150,46 +143,42 @@ void loop () { slip_off += SLIP.write(slip_buf+slip_off, avail); } #endif - if (Serial.available()) { - č = micros(); - if (w < sizeof p.artnet.data * 2) - recording[w++] = Serial.read(); - else - Serial.read(); + if /* while */ (n <= sizeof p.artnet.data && ((!n && micros() - last_byte < 1e6) || micros() - last_byte < 50)) { + if (recording && Serial.available()) { + unsigned char r = Serial.read(); + last_byte = micros(); + if (!n) { + /* + if (r) { + n = 0; + return; + } + n++; + continue; + */ + recording = !r; + attachInterrupt(interrupt, isr, CHANGE); + last_fall = 0; + n++; + return; + } + if (!flash_hack || r != 255) + p.artnet.data[n-1] = r; + n++; + } } - if (č + 200 < micros() && w) { - // if (send) { - unsigned t = 0; - if (w == sizeof p.artnet.data) // če smo break zaznali kot bajt, ga odstranimo - t = 1; - unsigned l = w-t-1; // en je tip - /* for (T = 0; T < w; T++) // prvi kanal ne sme biti 0, tako zaznamo začetek paketa - if (recording[T] > 1) - break; */ - /* for (unsigned i = 0; i < sizeof p.artnet.data; i++) // takes too long??? - if (!(hack_for_midi_flash && recording[t + 1] == 255)) - p.artnet.data[i] = recording[t + 1]; */ - memcpy(p.artnet.data, recording + t + 1, sizeof p.artnet.data); - if (l > sizeof p.artnet.data) - l = sizeof p.artnet.data; - /* l++; - while (--l) - if (p.data[l-1]) - break; */ - if (!recording[t]) { - p.artnet.length_hi = l / 256; - p.artnet.length_lo = l % 256; -#ifdef DO_WIFI - IPAddress b(255, 255, 255, 255); - u.beginPacket(b, 6454); - u.write((unsigned char *) &p.artnet, sizeof p.artnet - sizeof p.artnet.data + l); - u.endPacket(); -#endif -#ifdef DO_SLIP + else if (recording) { + recording = 0; + if (n != 513) + DEBUG("n: " + String(n)); + if (n == sizeof p.artnet.data + 1) { + p.artnet.length_hi = (n-1) / 256; + p.artnet.length_lo = (n-1) % 256; +#ifdef SLIP if (slip_off >= slip_len) { - p.ip.identifier = htons(millis()); - p.udp.length = htons(sizeof p.udp + sizeof p.artnet - sizeof p.artnet.data + l); - p.ip.length = htons(sizeof p - sizeof p.artnet.data + l); + p.ip.identifier = htons(sent_packets++); + p.udp.length = htons(sizeof p.udp + sizeof p.artnet); + p.ip.length = htons(sizeof p); p.ip.checksum = 0; uint32_t sum = 0; for (unsigned i = 0; i < sizeof p.ip/2+sizeof p.ip%2; i++) @@ -217,14 +206,11 @@ void loop () { } slip_buf[slip_len++] = END; } +#else + // DEBUG("ch1: " + p.artnet.data[0]); #endif } - /* - Serial1.println("dolžina podatkov " + String(w-T) + ", tip: " + String(t)); - for (unsigned i = 0; i < l; i++) - if (p.artnet.data[i]) - Serial1.println("\t" + String(i+1) + ": " + String(p.artnet.data[i])); - */ - w = 0; + attachInterrupt(interrupt, isr, CHANGE); + last_fall = 0; } } |