renamed Serial0 to Serial and removed unwanted files

Author: alfran

cores/arduino/HardwareSerial.cpp

@@ -44,7 +44,7 @@
 /* UART handler declaration */
 UART_HandleTypeDef UartHandle;
 
-HardwareSerial Serial0(UART4_dev);
+HardwareSerial Serial(UART4_dev);//Serial0(UART4_dev);
 HardwareSerial Serial1(USART3_dev);
 HardwareSerial Serial2(USART2_dev);
 HardwareSerial Serial3(USART6_dev);

cores/arduino/HardwareSerial.h

@@ -79,7 +79,7 @@ class HardwareSerial : public Stream {
     uint8 rx_pin;
 };
 
-extern HardwareSerial Serial0;
+extern HardwareSerial Serial;//Serial0;
 extern HardwareSerial Serial1;
 extern HardwareSerial Serial2;
 extern HardwareSerial Serial3;

cores/arduino/usb_serial.cpp

@@ -57,7 +57,7 @@ extern __IO uint32_t UserRxBufPtrIn;
 extern __IO uint32_t UserRxBufPtrOut;
 __IO  uint32_t usbEnableBlockingTx;
 
-USBSerial Serial;
+//USBSerial Serial;
 USBSerial SerialUSB;
 
 

cores/arduino/usb_serial.h

@@ -71,7 +71,7 @@ class USBSerial : public Stream {
 
 };
 
-extern USBSerial Serial;
+//extern USBSerial Serial;
 extern USBSerial SerialUSB;
 
 #endif

libraries/Audio/example/SimpleAudioPlayer/SimpleAudioPlayer.ino

@@ -22,8 +22,8 @@
 
 void setup() {
   // initialize serial communication at 9600 bits per second:
-  Serial.begin(115200);
-  delay(15000);
+  SerialUSB.begin(115200);
+  while(!SerialUSB);
 
   /* Test begin() method */
   while (SD.begin(SD_DETECT_PIN) != TRUE)
@@ -38,21 +38,21 @@ void loop() {
   const int S = 1024; // Number of samples to read in block
   uint32_t buffer[S];
   int duration;
-  delay(5000);        // delay for console
+  delay(1000);        // delay for console
 
   File myFile = SD.open("test.wav");
   if (!myFile.available()) {
     // if the file didn't open, print an error and stop
-    Serial.println("error opening test.wav");
+    SerialUSB.println("error opening test.wav");
     while (true);
   } else {
-    Serial.println("test.wav open OK");
+    SerialUSB.println("test.wav open OK");
   }
 
   myFile.read((void*) &WaveFormat, sizeof(WaveFormat));
 
   delay(1000);
-  Serial.println("STARTUP AUDIO\r\n");
+  SerialUSB.println("STARTUP AUDIO\r\n");
   delay(1000);
   Audio.begin(WaveFormat.SampleRate, 100);
 
@@ -68,7 +68,7 @@ void loop() {
     // Every 100 block print a '.'
     count++;
     if (count == 1000) {
-      Serial.print(".");
+      SerialUSB.print(".");
       count = 0;
     }
     // read from the file into buffer
@@ -78,11 +78,11 @@ void loop() {
     Audio.write(buffer, sizeof(buffer));
   }
   /* reaching end of file */
-  Serial.println("End of file. Thank you for listening!");
+  SerialUSB.println("End of file. Thank you for listening!");
   Audio.end();
   myFile.close();
 
   delay(5000);
-  Serial.println("Restart Playing");
+  SerialUSB.println("Restart Playing");
 
   }

libraries/Audio/example/SimpleAudioPlayerWithDebug/SimpleAudioPlayerWithDebug.ino

@@ -10,7 +10,7 @@
  Original by Frederic Pillon November 09, 2016
 
  This example code is in the public domain
- 
+
  * A sound file named "record.wav" in the root directory of the SD card
  * will be created. Record duration is 30 seconds.
 
@@ -26,9 +26,9 @@ const char recFile[] = "record.wav";
 #define RECORD_5PERCENT     ((5*REC_SAMPLE_LENGTH)/100)
 
 void setup() {
-  // initialize serial communication at 115200 bits per second:
-  Serial.begin(115200);
-  delay(15000);
+  // initialize SerialUSB communication at 115200 bits per second:
+  SerialUSB.begin(115200);
+  while(!SerialUSB);
 
   while (SD.begin(SD_DETECT_PIN) != TRUE)
   {
@@ -48,37 +48,37 @@ void loop() {
   File myFile = SD.open(recFile, FILE_WRITE);
   if (!SD.exists(recFile)) {
     // If the file didn't open, print an error and stop
-    Serial.print("Error: failed to create ");
-    Serial.println(recFile);
+    SerialUSB.print("Error: failed to create ");
+    SerialUSB.println(recFile);
     while (true);
   } else {
-    Serial.print(recFile);
-    Serial.println(" created succesfully.");
+    SerialUSB.print(recFile);
+    SerialUSB.println(" created succesfully.");
   }
 
   // Initialize header file
   status = WavProcess_EncInit(&WaveFormat, AUDIO_IN_FREQUENCY, pHeaderBuff);
   if( status != 0 ) {
-    Serial.print("Error: could not encode wav header: ");
-    Serial.println(status, DEC);
-    while (true);      
+    SerialUSB.print("Error: could not encode wav header: ");
+    SerialUSB.println(status, DEC);
+    while (true);
   }
   if (myFile.write(pHeaderBuff, sizeof(pHeaderBuff)) != sizeof(pHeaderBuff)){
-    Serial.print("Error: could not write header to ");
-    Serial.println(recFile);
+    SerialUSB.print("Error: could not write header to ");
+    SerialUSB.println(recFile);
     while (true);
   }
 
   delay(1000);
-  Serial.println("Start AUDIO record");
+  SerialUSB.println("Start AUDIO record");
   delay(1000);
   status = Audio.begin(WaveFormat.SampleRate, 100, AUDIO_IN);
   if (status != 0) {
-    Serial.print("Error: Audio could not begin: ");
-    Serial.println(status, DEC);
+    SerialUSB.print("Error: Audio could not begin: ");
+    SerialUSB.println(status, DEC);
     while (true);
   } else {
-    Serial.println("Audio begin: OK");
+    SerialUSB.println("Audio begin: OK");
   }
 
   delay(1000);
@@ -87,42 +87,42 @@ void loop() {
   int volume = 100;
   Audio.prepare(NULL, S, volume);
   delay(1000);
-  
+
   // MAX Recording time reached, so stop audio interface and close file
   while ( Audio.getSampleIn() < REC_SAMPLE_LENGTH) {
     if ( Audio.isBufferInFull()) {
       byteswritten = myFile.write((uint8_t*)Audio.getBufferInWithOffset(), Audio.getBufferInSize());
       Audio.setBufferInEmpty(byteswritten);
     }
-    
+
     // Display percent of recording every 5%
     if ( ((Audio.getSampleIn() / RECORD_5PERCENT) - count) == 1)
-    {    
+    {
       count++;
-      Serial.print(5*count, DEC);
-      Serial.println("%");
+      SerialUSB.print(5*count, DEC);
+      SerialUSB.println("%");
     }
-    
+
   }
-  
+
   // Update wav header file
   if (myFile.seek(0) == TRUE)
   {
       // Update the wav file header and save it into wav file
       WavProcess_HeaderUpdate(pHeaderBuff, Audio.getSampleIn());
       if (myFile.write(pHeaderBuff, sizeof(pHeaderBuff)) != sizeof(pHeaderBuff)){
-        Serial.print("Error: header not updated to ");
-        Serial.println(recFile);
+        SerialUSB.print("Error: header not updated to ");
+        SerialUSB.println(recFile);
         while (true);
       }
   }
   else
   {
-    Serial.println("Error: could not update wav header.");
+    SerialUSB.println("Error: could not update wav header.");
     while (true);
   }
 
-  Serial.println("End of recording. Thank you!");
+  SerialUSB.println("End of recording. Thank you!");
   Audio.end();
   myFile.close();
   while(1);