Update to new build system.

[clinton/Smoothieware.git] / src / modules / communication / SerialConsole.cpp

diff --git a/src/modules/communication/SerialConsole.cpp b/src/modules/communication/SerialConsole.cpp
index 09ab0f8..4d55aad 100644 (file)
--- a/src/modules/communication/SerialConsole.cpp
+++ b/src/modules/communication/SerialConsole.cpp
@@ -1,73 +1,64 @@
-/*  
+/*
       This file is part of Smoothie (http://smoothieware.org/). The motion control part is heavily based on Grbl (https://github.com/simen/grbl).
       Smoothie is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
       Smoothie is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-      You should have received a copy of the GNU General Public License along with Smoothie. If not, see <http://www.gnu.org/licenses/>. 
+      You should have received a copy of the GNU General Public License along with Smoothie. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <string>
+#include <stdarg.h>
 using std::string;
-#include "mbed.h"
 #include "libs/Module.h"
 #include "libs/Kernel.h"
 #include "libs/nuts_bolts.h"
 #include "SerialConsole.h"
 #include "libs/RingBuffer.h"
+#include "libs/SerialMessage.h"
+#include "libs/StreamOutput.h"
 
 // Serial reading module
-// Treats every received line as a command and passes it ( via event call ) to the command dispatcher. 
+// Treats every received line as a command and passes it ( via event call ) to the command dispatcher.
 // The command dispatcher will then ask other modules if they can do something with it
-SerialConsole::SerialConsole( PinName rx_pin, PinName tx_pin, int baud_rate )  : Serial( rx_pin, tx_pin ){ //We extend Serial, it is convenient
-    this->baud(baud_rate);
-}  
+SerialConsole::SerialConsole( PinName rx_pin, PinName tx_pin, int baud_rate ){
+    this->serial = new mbed::Serial( rx_pin, tx_pin );
+    this->serial->baud(baud_rate);
+}
 
 // Called when the module has just been loaded
 void SerialConsole::on_module_loaded() {
     // We want to be called every time a new char is received
-    this->attach(this, &SerialConsole::on_serial_char_received, Serial::RxIrq);
+    this->serial->attach(this, &SerialConsole::on_serial_char_received, mbed::Serial::RxIrq);
 
     // We only call the command dispatcher in the main loop, nowhere else
     this->register_for_event(ON_MAIN_LOOP);
+
+    // Add to the pack of streams kernel can call to, for example for broadcasting
+    this->kernel->streams->append_stream(this);
 }
-        
+
 // Called on Serial::RxIrq interrupt, meaning we have received a char
 void SerialConsole::on_serial_char_received(){
-    if(this->readable()){
-        char received = this->getc();
-        //On newline, we have received a line, else concatenate in buffer
-        if( received == '\r' ){ return; }
-        //if( received == '\n' ){
-        //    this->line_received();
-        //    receive_buffer = "";
-        //}else{
-        //    this->receive_buffer += received;                
-        //}
-        this->buffer.push_back(received); 
+    while(this->serial->readable()){
+        char received = this->serial->getc();
+        // convert CR to NL (for host OSs that don't send NL)
+        if( received == '\r' ){ received = '\n'; }
+        this->buffer.push_back(received);
     }
 }
-        
-// Call event when newline received, for other modules to read the line
-inline void SerialConsole::line_received(){
-  //string new_string = this->receive_buffer;
-  //this->received_lines.insert(this->received_lines.begin(),new_string);
-}
 
 // Actual event calling must happen in the main loop because if it happens in the interrupt we will loose data
 void SerialConsole::on_main_loop(void * argument){
-    //if( this->received_lines.size() < 1 ){ 
-    //    return; 
-    //}
-    //this->kernel->call_event(ON_CONSOLE_LINE_RECEIVED, &this->received_lines.back() ); 
-    //this->received_lines.pop_back();
     if( this->has_char('\n') ){
-        int index = 0;
         string received;
+        received.reserve(20);
         while(1){
            char c;
            this->buffer.pop_front(c);
            if( c == '\n' ){
-                //this->printf("received: <%s> \r\n", received.c_str() );
-                this->kernel->call_event(ON_CONSOLE_LINE_RECEIVED, &received ); 
+                struct SerialMessage message;
+                message.message = received;
+                message.stream = this;
+                this->kernel->call_event(ON_CONSOLE_LINE_RECEIVED, &message );
                 return;
             }else{
                 received += c;
@@ -76,6 +67,22 @@ void SerialConsole::on_main_loop(void * argument){
     }
 }
 
+
+int SerialConsole::puts(const char* s)
+{
+    return fwrite(s, strlen(s), 1, (FILE*)this->serial);
+}
+
+int SerialConsole::_putc(int c)
+{
+    return this->serial->putc(c);
+}
+
+int SerialConsole::_getc()
+{
+    return this->serial->getc();
+}
+
 bool SerialConsole::has_char(char letter){
     int index = this->buffer.head;
     while( index != this->buffer.tail ){