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
Revision 70:5be3966a8a0b, committed 2013-07-28
- Comitter:
- tobyspark
- Date:
- Sun Jul 28 10:31:14 2013 +0000
- Parent:
- 69:cd1c85de3e38
- Child:
- 71:d6d0ff33cf5b
- Commit message:
- .ini - network read bugfix
Changed in this revision
spk_settings.h | Show annotated file Show diff for this revision Revisions of this file |
--- a/spk_settings.h Sat Jul 27 20:41:57 2013 +0000 +++ b/spk_settings.h Sun Jul 28 10:31:14 2013 +0000 @@ -224,7 +224,7 @@ IpAddr controllerAddress = ipAddrWithString(iniparser_getstring(settings, "OSC:ControllerAddress", failString)); netReadOK = netReadOK && !controllerAddress.isNull(); - int controllerPort = iniparser_getboolean(settings, "OSC:ControllerPort", failInt); + int controllerPort = iniparser_getint(settings, "OSC:ControllerPort", failInt); netReadOK = netReadOK && controllerPort != failInt; IpAddr controllerSubnetMask = ipAddrWithString(iniparser_getstring(settings, "OSC:ControllerSubnetMask", failString)); @@ -239,7 +239,7 @@ IpAddr sendAddress = ipAddrWithString(iniparser_getstring(settings, "OSC:SendAddress", failString)); netReadOK = netReadOK && !sendAddress.isNull(); - int sendPort = iniparser_getboolean(settings, "OSC:SendPort", failInt); + int sendPort = iniparser_getint(settings, "OSC:SendPort", failInt); netReadOK = netReadOK && sendPort != failInt; IpAddr artNetControllerAddress = ipAddrWithString(iniparser_getstring(settings, "ArtNet:ControllerAddress", failString)); @@ -248,16 +248,16 @@ IpAddr artNetBroadcastAddress = ipAddrWithString(iniparser_getstring(settings, "ArtNet:BroadcastAddress", failString)); netReadOK = netReadOK && !artNetBroadcastAddress.isNull(); - int inChannelXFade = iniparser_getboolean(settings, "DMX:InChannelXFade", failInt); + int inChannelXFade = iniparser_getint(settings, "DMX:InChannelXFade", failInt); netReadOK = netReadOK && inChannelXFade != failInt; - int inChannelFadeUp = iniparser_getboolean(settings, "DMX:InChannelFadeUp", failInt); + int inChannelFadeUp = iniparser_getint(settings, "DMX:InChannelFadeUp", failInt); netReadOK = netReadOK && inChannelFadeUp != failInt; - int outChannelXFade = iniparser_getboolean(settings, "DMX:OutChannelXFade", failInt); + int outChannelXFade = iniparser_getint(settings, "DMX:OutChannelXFade", failInt); netReadOK = netReadOK && outChannelXFade != failInt; - int outChannelFadeUp = iniparser_getboolean(settings, "DMX:OutChannelFadeUp", failInt); + int outChannelFadeUp = iniparser_getint(settings, "DMX:OutChannelFadeUp", failInt); netReadOK = netReadOK && outChannelFadeUp != failInt; if (netReadOK)