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: main.cpp

Revision:
4:d5ff91b66357
Parent:
3:033d2b7768f3
Child:
5:f8b285ca41ba
diff -r 033d2b7768f3 -r d5ff91b66357 main.cpp
--- a/main.cpp	Sun Apr 15 23:58:52 2012 +0000
+++ b/main.cpp	Mon Apr 23 09:30:50 2012 +0000
@@ -52,10 +52,10 @@
 //// mBED PIN ASSIGNMENTS
 
 // Inputs
-AnalogIn xFadeAIN(p19);    
-AnalogIn fadeUpAIN(p20);
+AnalogIn xFadeAIN(p20);    
+AnalogIn fadeUpAIN(p19);
 DigitalIn tapLeftDIN(p24);
-DigitalIn tapRightDIN(p21);
+DigitalIn tapRightDIN(p23);
 
 SPKRotaryEncoder menuEnc(p17, p16, p15);
 
@@ -64,8 +64,7 @@
 PwmOut fadeBPO(LED2);
 
 // SPKTVOne(PinName txPin, PinName rxPin, PinName signWritePin, PinName signErrorPin, Serial *debugSerial)
-SPKTVOne tvOne(p28, p27, LED3, LED4, debug);
-//SPKTVOne tvOne(p28, p27, LED3, LED4);
+SPKTVOne tvOne(p13, p14, LED3, LED4, debug);
 
 // SPKDisplay(PinName mosi, PinName clk, PinName cs, PinName dc, PinName res, Serial *debugSerial = NULL);
 SPKDisplay screen(p5, p7, p8, p10, p9, debug);