WIP: Web interface, UPDATED Readme.md

Author: Tim Essig

.gitignore

@@ -5,4 +5,6 @@
 *.eep
 *.sym
 obj/**
-.dep/**
+.dep/**
+
+.directory

EtherCard.cpp

@@ -9,7 +9,7 @@
 //
 // 2010-05-19 <jc@wippler.nl>
 
-#include "ethercard.h"
+#include "EtherCard.h"
 #include <stdarg.h>
 #include <avr/eeprom.h>
 #include <stdlib.h>

ethercard.h renamed to EtherCard.h

@@ -42,14 +42,14 @@
 *   still compile but the program will not work. Saves about 60 bytes SRAM and
 *   1550 bytes flash.
 */
-#define ETHERCARD_DHCP 1
+#define ETHERCARD_DHCP 0
 
 /** Enable client connections.
 * Setting this to zero means that the program cannot issue TCP client requests
 * anymore. Compilation will still work but the request will never be
 * issued. Saves 4 bytes SRAM and 550 byte flash.
 */
-#define ETHERCARD_TCPCLIENT 1
+#define ETHERCARD_TCPCLIENT 0
 
 /** Enable TCP server functionality. 
 *   Setting this to zero means that the program will not accept TCP client

README.md

@@ -0,0 +1,39 @@
+ 
+# ArtNetNode 4
+
+Small Xmega32 and enc28j60 based DYI ArtNet Node with 4 DMX ports.
+
+## Features:
+    - 4 DMX Outputs(full 512 channels)
+    - Testes framerate: 4x 52 FPS
+    - Web Interface for configuration(WIP, see TODO)
+    - industry standard 19" 1U housing
+
+
+## TODO:
+ - [ ] Finish WebInterface
+ - [ ] Persist Settings(Name, IP, Universes)
+ - [ ] Use DMX Ports as Input
+ - [ ] Implement ArtPoolReplay
+ - [ ] Implement other ArtNet functions(setName,...)
+
+
+ ## Images
+
+ ![First Prototype](images/ArtNetNode_Prototype_1.jpeg "First Prototype")
+ First Prototype
+
+ ![PCB](images/ArtNetNode_PCB.jpeg "PCB")
+ Fresh PCB's
+
+ ![Soldered PCB's](images/ArtNetNode_Prototype_2.jpeg "Soldered PCB's")
+ Soldered PCB's
+
+ ![Mounted front plate](images/ArtNetNode_Front1.jpeg "Mounted front plate")
+ Mounted front plate
+
+ ![Full Housing](images/ArtNetNode_FullHousing.jpeg "Full Housing")
+ Full Housing
+
+
+

artnet.cpp

@@ -1,27 +1,171 @@
 #include "artnet.h"
 #include "dmx.h"
+#include "EtherCard.h"
+
+#include <string.h> //memcpy
 
 
 volatile uint8_t universeFPS[DMX_NUM_UNIVERSES];
 volatile uint8_t universeFPSCounter[DMX_NUM_UNIVERSES] = {0};
 
-uint8_t getUniverseFPS(uint8_t universe) {
+ArtNet artnet; //Global instance of ArtNet class
+
+// Opcodes
+#define ART_POLL        0x2000
+#define ART_POLL_REPLAY 0x2100
+#define ART_DMX         0x5000
+// Buffers
+#define MAX_BUFFER_ARTNET 530
+// Packet
+#define ART_NET_ID "Art-Net\0"
+
+
+
+/**
+ * Receive ArtNet Packages from Ethercard 
+ * 
+ * 
+ **/
+void ArtNet::udpArtNet(uint16_t dest_port, uint8_t src_ip[IP_LEN], uint16_t src_port, const char *data, uint16_t len) {
+	uint8_t result = strncmp(data, "Art-Net",7);
+
+	uint16_t opCode = (data[9] << 8) | data[8];
+	uint16_t protocolVersion = data[10] << 8 | data[11];
+
+	uint16_t universe = data[14] | data[15] << 8 ;
+	uint16_t length = data[16] << 8 | data[17];
+
+
+    if(opCode == ART_POLL) {
+        PORTA.OUTTGL = 0x02;
+        sendArtPollReplay();
+    } else if(opCode == ART_DMX) {
+		if (universe < 4) { 
+            memcpy(dmxBuffer[universe], data + 18, length);
+            universeReceivedTMP(universe);
+        }
+	}
+}
+
+uint8_t ArtNet::getUniverseFPS(uint8_t universe) {
     if(universe < DMX_NUM_UNIVERSES) {
         return universeFPS[universe];
     } else {
         return 0;
     }
 }
 
-void universeReceivedTMP(uint8_t universe) {
+void ArtNet::universeReceivedTMP(uint8_t universe) {
     if(universe < DMX_NUM_UNIVERSES) {
         universeFPSCounter[universe]++;
     }
 }
 
-void doTimerStuff1Hz(void) {
+void ArtNet::doTimerStuff1Hz(void) {
     for(uint8_t i=0; i < 4; i++) {
         universeFPS[i] = universeFPSCounter[i];
         universeFPSCounter[i] = 0;
     }
+}
+
+void ArtNet::sendArtPollReplay(void) {
+    //Build ArtPollReplay Package
+    struct ArtPollReplay_t {
+        uint8_t id[8];
+        uint8_t opCode[2];
+        uint8_t ipAddress[4];
+        uint8_t port[2];
+        uint8_t versInfoH;
+        uint8_t versInfoL;
+        uint8_t netSwitch;
+        uint8_t subSwitch;
+        uint8_t oemHi;
+        uint8_t oem;
+        uint8_t ubeaVersion;
+        uint8_t status1;
+        uint8_t estaManLo;
+        uint8_t estaManHi;
+        uint8_t shortName[18];
+        uint8_t longName[64];
+        uint8_t nodeReport[64];
+        uint8_t numPortsHi;
+        uint8_t numPortsLo;
+        uint8_t portTypes[4];
+        uint8_t goodInput[4];
+        uint8_t goodOutput[4];
+        uint8_t swIn[4];
+        uint8_t swOut[4];
+        uint8_t swVideo;
+        uint8_t swMacro;
+        uint8_t swRemote;
+        uint8_t spare[3];
+        uint8_t style;
+        uint8_t mac[6];
+        uint8_t bindIp[4];
+        uint8_t bindIndex;
+        uint8_t status2;
+        uint8_t filler[26];
+    } replay;
+
+    memcpy(replay.id,ART_NET_ID, 8);
+    replay.opCode[0] = ART_POLL_REPLAY;
+    replay.opCode[1] = ART_POLL_REPLAY >> 8;
+    
+    memcpy(replay.ipAddress, ether.myip, IP_LEN);
+
+    replay.port[0] = 0x36;
+    replay.port[1] = 0x19;
+
+    replay.versInfoH = 0;
+    replay.versInfoL = 1;
+
+    replay.netSwitch = 0;
+    replay.subSwitch = 0;
+
+    replay.oemHi = 0;
+    replay.oem = 0;
+
+    replay.ubeaVersion = 0;
+
+    replay.status1 = 0xF0;
+
+    replay.estaManLo = 'E';
+    replay.estaManHi = 'T';
+
+    memcpy(replay.shortName,"ArtNetNode 4      ", 18);
+    memcpy(replay.longName,"ArtNetNode 4 LONG     ", 22);
+    //memcpy(replay.nodeReport,"ArtNetNode 4 LONG     ", 64);
+
+    replay.numPortsHi = 0;
+    replay.numPortsLo = 4;
+
+    //4x ArtNet Output + DMX512 Mode
+    replay.portTypes[0] = 1 << 7;
+    replay.portTypes[1] = 1 << 7;
+    replay.portTypes[2] = 1 << 7;
+    replay.portTypes[3] = 1 << 7;
+
+
+    //replay.goodInput[] //TODO: Unused, transmit as zero
+
+    //TODO: Relay check transmission status
+    replay.goodOutput[0] = 1 << 7;
+    replay.goodOutput[1] = 1 << 7;
+    replay.goodOutput[2] = 1 << 7;
+    replay.goodOutput[3] = 1 << 7;
+
+    replay.style = 0x00; //Style 0x00 -> A DMX to7from Art-Net device
+
+    memcpy(replay.mac, ether.mymac, ETH_LEN);
+    memcpy(replay.bindIp, ether.myip, IP_LEN);
+    
+    replay.bindIndex = 1; //Root device
+
+    replay.status2 = 1 << 3; //Supports ArtNed 3 + 4 Port adresses
+
+    //TODO: Don't use static ip
+    uint8_t hisip[4] = {0x02, 0x0, 0x0, 123};
+
+    //static void sendUdp (char *data,uint8_t len,uint16_t sport, uint8_t *dip, uint16_t dport);      
+     ether.sendUdp((char*)&replay, sizeof(replay), UDP_PORT_ARTNET_REPLY, hisip, UDP_PORT_ARTNET_REPLY ); //*/
 }

artnet.h

@@ -2,17 +2,34 @@
 #define _ARTNET_H   1
 
 #include <avr/io.h>
+#include "net.h"
 
 // Port to listen on
 #define UDP_PORT_ARTNET       6454  /* (0x1936) */
 // Port to reply on
 #define UDP_PORT_ARTNET_REPLY (UDP_PORT_ARTNET + 1)
 
 
-extern uint8_t getUniverseFPS(uint8_t universe);
 
-extern void universeReceivedTMP(uint8_t universe);
 
-extern void doTimerStuff1Hz(void);
+class ArtNet {
+
+public:
+    static void udpArtNet(uint16_t dest_port, uint8_t src_ip[IP_LEN], uint16_t src_port, const char *data, uint16_t len);
+
+    static uint8_t getUniverseFPS(uint8_t universe);
+
+    static void universeReceivedTMP(uint8_t universe);
+
+    static void doTimerStuff1Hz(void);
+
+private:
+    static void sendArtPollReplay(void);
+};
+
+
+extern ArtNet artnet;
+
+
 
 #endif

dhcp.cpp

@@ -16,7 +16,7 @@
 
 #include <avr/io.h>
 
-#include "ethercard.h"
+#include "EtherCard.h"
 #include "net.h"
 #include "timer.h"
 

display.cpp

@@ -48,10 +48,10 @@ void writeDirect(uint8_t b) {
 
 void pulseEnable(uint8_t _data){
   writeDirect(_data | En);  // En high
-  _delay_ms(1);   // enable pulse must be >450ns
+  _delay_us(1);   // enable pulse must be >450ns
 
   writeDirect(_data & ~En); // En low
-  _delay_ms(1);    // commands need > 37us to settle
+  _delay_us(38);    // commands need > 37us to settle
 } 
 
 void write4bits(uint8_t data) {
@@ -71,7 +71,7 @@ void command(uint8_t value) {
   send(value, 0);
 }
 
-void writeStr(char value[]) {
+void writeStr(const char value[]) {
     while(*value != 0) {
         send(*value++, Rs);
     }

display.h

@@ -58,7 +58,7 @@
 
 extern void setupTWI(void);
 extern void twiWrite(unsigned char byte);
-extern void writeStr(char* value);
+extern void writeStr(const  char* value);
 extern void writeInt(uint8_t value);
 extern void writeIntWidth(uint8_t value, uint8_t width);
 extern void write(uint8_t value);

dns.cpp

@@ -4,7 +4,7 @@
 //
 // 2010-05-20 <jc@wippler.nl>
 
-#include "ethercard.h"
+#include "EtherCard.h"
 #include "net.h"
 
 #include "timer.h"

enc28j60.cpp

@@ -408,7 +408,7 @@ uint8_t ENC28J60::initialize (uint16_t size, const uint8_t* macaddr) {
     while (!readOp(ENC28J60_READ_CTRL_REG, ESTAT) & ESTAT_CLKRDY);
 
 
-    
+    //TODO: Check full/half duplex
 
     writeReg(ERXST, RXSTART_INIT);
     writeReg(ERXRDPT, RXSTART_INIT);
@@ -433,6 +433,7 @@ uint8_t ENC28J60::initialize (uint16_t size, const uint8_t* macaddr) {
     writeRegByte(MAADR1, macaddr[4]);
     writeRegByte(MAADR0, macaddr[5]);
     writePhy(PHCON2, PHCON2_HDLDIS);
+    writePhy(PHCON1, PHCON1_PDPXMD); //Full Duplex mode
     SetBank(ECON1);
     writeOp(ENC28J60_BIT_FIELD_SET, EIE, EIE_INTIE|EIE_PKTIE);
     writeOp(ENC28J60_BIT_FIELD_SET, ECON1, ECON1_RXEN);
@@ -450,6 +451,12 @@ bool ENC28J60::isLinkUp() {
     return (readPhyByte(PHSTAT2) >> 2) & 1;
 }
 
+bool ENC28J60::isReceiveError () {
+    bool result = readRegByte(EIR) & EIR_RXERIF;
+    writeOp(ENC28J60_BIT_FIELD_CLR, EIR, EIR_RXERIF); //Clear flag
+    return result;
+}
+
 /*
 struct __attribute__((__packed__)) transmit_status_vector {
     uint16_t transmitByteCount;

enc28j60.h

@@ -23,12 +23,12 @@
 // the entire available packet buffer space is allocated
 
 #define RXSTART_INIT        0x0000  // start of RX buffer, (must be zero, Rev. B4 Errata point 5)
-#define RXSTOP_INIT         0x1BFF  // end of RX buffer, room for 2 packets
+#define RXSTOP_INIT         0x15FF  // end of RX buffer, room for 2 packets
 
-#define TXSTART_INIT        0x1C00  // start of TX buffer, room for 1 packet
-#define TXSTOP_INIT         0x1EFF  // end of TX buffer
+#define TXSTART_INIT        0x1600  // start of TX buffer, room for 1 packet
+#define TXSTOP_INIT         0x1BDC  // end of TX buffer
 
-#define SCRATCH_START       0x1F00  // start of scratch area
+#define SCRATCH_START       0x1BDD  // start of scratch area
 #define SCRATCH_LIMIT       0x2000  // past end of area, i.e. 3 Kb
 #define SCRATCH_PAGE_SHIFT  6       // addressing is in pages of 64 bytes
 #define SCRATCH_PAGE_SIZE   (1 << SCRATCH_PAGE_SHIFT)
@@ -67,6 +67,11 @@ class ENC28J60 {
     */
     static bool isLinkUp ();
 
+    /**   @brief  Check if an receive error occured and resets the flag
+    *     @return <i>bool</i> True if an receive error occured(Datasheet 12.1.2)
+    */
+    static bool isReceiveError ();
+
     /**   @brief  Sends data to network interface
     *     @param  len Size of data to send
     *     @note   Data buffer is shared by recieve and transmit functions