Diff: main.cpp

Revision:

1:35e4090cf6aa

Parent:

0:ef6fc1737022

--- a/main.cpp	Mon Jan 17 16:53:37 2011 +0000
+++ b/main.cpp	Wed Jul 15 19:07:30 2015 +0000
@@ -1,6 +1,9 @@
 
 #include "mbed.h"
-#include "SDFileSystem.h"
+
+//The next two includes are from the SDHC File System
+ #include "string"
+ #include "SDHCFileSystem.h"
 
 #define SAMPLE_FREQ 40000
 #define BUF_SIZE (SAMPLE_FREQ/10)
@@ -35,12 +38,12 @@
 DigitalOut led3(LED3);
 DigitalOut led4(LED4);
 DigitalOut digout(p8);
-DigitalIn pushbutton(p24);
-PwmOut body(p21);
-PwmOut mouth(p22);
+DigitalIn pushbutton(p22);
+PwmOut body(p25);
+PwmOut mouth(p24);
 PwmOut tail(p23);
 Ticker tick;
-SDFileSystem sd(p5, p6, p7, p13, "sd");
+SDFileSystem sd(p5, p6, p7, p13, "sd"); 
 
 // global variables used both by the main program and the ISR
 short DAC_fifo[256];    // FIFO for the DAC
@@ -79,7 +82,7 @@
   
     fgets(cmdline,100,cmdfile);
     while (!feof(cmdfile)) {
-      printf("Parsing '%s' from command file '%s'\n",cmdline,cmdfile_name);
+      printf("Parsing '%s' from command file '%s'\n",cmdline,cmdfile_name);  
       tmp=strchr(cmdline,'#');
       if (tmp) *tmp=0;
       movfile=strchr(cmdline,' ');
@@ -281,7 +284,7 @@
 
 
 void dac_out() {
-        int value;
+ // This line declared but not used       int value;
     digout=1;
     if (!movements[current_movement].played) {
         if (movements[current_movement].sample<=slice) {