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 18:ebe5da639a6a, committed 2012-10-08
- Comitter:
- tobyspark
- Date:
- Mon Oct 08 00:39:40 2012 +0000
- Parent:
- 17:fc68d40b8b1f
- Child:
- 19:94d715b9d231
- Commit message:
- Two typo-esque fixes
Changed in this revision
SPK-TVOne.lib | Show annotated file Show diff for this revision Revisions of this file |
main.cpp | Show annotated file Show diff for this revision Revisions of this file |
--- a/SPK-TVOne.lib Sun Oct 07 12:48:44 2012 +0000 +++ b/SPK-TVOne.lib Mon Oct 08 00:39:40 2012 +0000 @@ -1,1 +1,1 @@ -http://mbed.org/users/tobyspark/code/SPK-TVOne/#4b0bf9a724a4 +http://mbed.org/users/tobyspark/code/SPK-TVOne/#c73d4c68a13b
--- a/main.cpp Sun Oct 07 12:48:44 2012 +0000 +++ b/main.cpp Mon Oct 08 00:39:40 2012 +0000 @@ -316,8 +316,8 @@ // Make sure our windows exist ok = ok && tvOne.command(0, kTV1WindowIDA, kTV1FunctionAdjustWindowsEnable, on); ok = ok && tvOne.command(0, kTV1WindowIDB, kTV1FunctionAdjustWindowsEnable, on); - ok = ok && tvOne.command(0, kTV1WindowIDA, kTV1FunctionAdjustWindowsLayerPriority, 1); // TODO: Setting this to 4 caused controller freeze? - ok = ok && tvOne.command(0, kTV1WindowIDB, kTV1FunctionAdjustWindowsLayerPriority, 2); + ok = ok && tvOne.command(0, kTV1WindowIDA, kTV1FunctionAdjustWindowsLayerPriority, 0); + ok = ok && tvOne.command(0, kTV1WindowIDB, kTV1FunctionAdjustWindowsLayerPriority, 1); // Assign inputs to windows, so that left on the crossfader is left on the processor viewed from front ok = ok && tvOne.command(0, kTV1WindowIDA, kTV1FunctionAdjustWindowsWindowSource, kTV1SourceRGB2); @@ -886,7 +886,7 @@ tapLeftWasFirstPressed = 0; } } - else xFade = fadeCalc(xFadeAINCached, xFadeTolerance); + else xFade = 1.0 - fadeCalc(xFadeAINCached, xFadeTolerance); fadeUp = 1.0 - fadeCalc(fadeUpAINCached, fadeUpTolerance); @@ -990,10 +990,10 @@ } if (updateFade && debug) { - debug->printf("\r\n"); //debug->printf("xFade = %3f fadeUp = %3f \r\n", xFadeAIN.read(), fadeUpAIN.read()); debug->printf("xFade = %3f fadeUp = %3f \r\n", xFadeAINCached, fadeUpAINCached); debug->printf("xFade = %3f fadeUp = %3f fadeA% = %i fadeB% = %i \r\n", xFade, fadeUp, fadeAPercent, fadeBPercent); + debug->printf("\r\n"); } } }