Revision 9:5fa90677ff3e, committed 2014-12-02

Comitter:

ddrew73

Date:

Tue Dec 02 20:07:33 2014 +0000

Parent:

8:725d938b301b

Child:

10:cfd60b63ed11

Commit message:

Pins named correctly for alpha;

Changed in this revision

--- a/main.cpp	Mon Dec 01 18:27:08 2014 +0000
+++ b/main.cpp	Tue Dec 02 20:07:33 2014 +0000
@@ -15,40 +15,36 @@
 Timer timer;
 
 //LED stuff
-I2C i2c_left(D7,D6);
+I2C i2c_left(PTC11,PTC10);
 Adafruit_24bargraph ledbar_left=Adafruit_24bargraph(&i2c_left);
 
-I2C i2c_right(D5,D4);
+I2C i2c_right(D7,D6);
 Adafruit_24bargraph ledbar_right=Adafruit_24bargraph(&i2c_right);
 
-DebounceIn upbutton(D9);
-DebounceIn downbutton(D8);
-DebounceIn leftbutton(D3);
-DebounceIn rightbutton(D2);
+DebounceIn upbutton(PTA16);
+DebounceIn downbutton(PTC17);
+DebounceIn leftbutton(PTC16);
+DebounceIn rightbutton(PTC13);
 
 //Scanner stuff
 
-DebounceIn scanbutton(D10);
+DebounceIn scanbutton(PTC12);
 
-DigitalOut A_in(D0);
-DigitalOut B_in(D1);
-DigitalOut C_in(D2);
-DigitalOut D_in(D3);
-DigitalOut E_in(D4);
-DigitalOut F_in(D5);
+DigitalOut A_in(PTB10);
+DigitalOut B_in(PTB11);
+DigitalOut C_in(PTE2);
+DigitalOut D_in(PTE3);
+DigitalOut E_in(PTE4);
+DigitalOut F_in(PTE5);
 
-DigitalOut A_out(PTC7);
-DigitalOut B_out(PTC0);
-DigitalOut C_out(PTC3);
-
-AnalogOut dac(PTE30);
 AnalogIn  adc(PTB0);
 
 
 
 
 //LCD stuff
-TextLCD lcd(D13,D12,PTA17,PTA16,PTC17,PTC16,TextLCD::LCD20x4);
+//extLCD(PinName rs, PinName e, PinName d4, PinName d5, PinName d6, PinName d7, LCDType type = LCD16x2);
+TextLCD lcd(PTC6,PTC5,D5,D4,D3,D2,TextLCD::LCD20x4);
 
 // cc3000 KL25Z wifi connection
 // we need to define connection pins for:
@@ -60,7 +56,7 @@
 // - SPI CLK  => (pin D13)
 // plus wifi network SSID, password, security level and smart-configuration flag.
 
-mbed_cc3000::cc3000 wifi(D3, D5, D10, SPI(D11, D12, D13),
+mbed_cc3000::cc3000 wifi(D8, D9, D10, SPI(D11, D12, D13),
                          "SSID", "PASSWORD", WPA2, false);
 Websocket ws("ws://sockets.mbed.org/ws/toastboard/rw");
 
@@ -88,7 +84,11 @@
 
     //LCD init
     lcd.cls();
-
+    
+    //Osci
+    int loopcount = 0, pressed = 0;
+    float begintime = 0, endtime = 0, elapsed = 0;
+    
 
     while(1) {
 
@@ -331,7 +331,15 @@
 pressed == 1;
 }
 
-ADD VOLTAGE TO OSCI BUFFER
+int sn = (colselect + 1)*(rowselect + 1);
+            A_in = (sn-1)&2;
+            B_in = ((sn-1)/2)%2;
+            C_in = ((sn-1)/4)%2;
+            D_in = ((sn-1)/8)%2;
+            E_in = ((sn-1)/16)%2;
+            F_in = ((sn-1)/32)%2;
+            volt_buffer[loopcount] = adc.read();
+            
 
 loopcount = loopcount +1;
 } // BREAK THE WHILE SCANBUTTON
@@ -339,6 +347,7 @@
 if (pressed == 1){
 timer.stop();
 endtime = timer.read_ms();
+elapsed = endtime - begintime;
 
 DO ENTIRE SCAN STUFF