Toby Harris / Mbed 2 deprecated SPK-DVIMXR

The codebase to run the *spark d-fuser controller www.sparkav.co.uk/dvimixer

Dependencies:   SPK-TVOne DMX DmxArtNet NetServicesMin OSC PinDetect mRotaryEncoder iniparser mbed spk_oled_ssd1305 filter

Diff: spk_settings.h

Revision:
77:20f948d4885e
Parent:
70:5be3966a8a0b
--- a/spk_settings.h	Tue Dec 10 15:51:54 2013 +0000
+++ b/spk_settings.h	Fri Jan 17 15:04:33 2014 +0000
@@ -29,6 +29,7 @@
     struct {
         IpAddr controllerAddress;
         IpAddr broadcastAddress;
+        int universe;
     } artNet;
     
     struct {
@@ -60,6 +61,7 @@
         
         artNet.controllerAddress = IpAddr(2,0,0,100);
         artNet.broadcastAddress = IpAddr(2,255,255,255);
+        artNet.universe = 0;
         
         dmx.inChannelXFade = 0;
         dmx.inChannelFadeUp = 1;
@@ -248,6 +250,9 @@
             IpAddr artNetBroadcastAddress = ipAddrWithString(iniparser_getstring(settings, "ArtNet:BroadcastAddress", failString));
             netReadOK = netReadOK && !artNetBroadcastAddress.isNull();
             
+            int universe = iniparser_getint(settings, "ArtNet:Universe", failInt);
+            netReadOK = netReadOK && universe != failInt;
+            
             int inChannelXFade = iniparser_getint(settings, "DMX:InChannelXFade", failInt);
             netReadOK = netReadOK && inChannelXFade != failInt;
             
@@ -274,6 +279,7 @@
     
                 artNet.controllerAddress = artNetControllerAddress;
                 artNet.broadcastAddress = artNetBroadcastAddress;
+                artNet.universe = universe;
         
                 dmx.inChannelXFade = inChannelXFade;
                 dmx.inChannelFadeUp = inChannelFadeUp;