X-Git-Url: https://git.hcoop.net/clinton/Smoothieware.git/blobdiff_plain/914670fb145767f44f6bf62a3018e7bd057e2269..61134a6598ee32d6fa1f0738990e3153af00d5dc:/src/modules/communication/SerialConsole.cpp?ds=sidebyside
diff --git a/src/modules/communication/SerialConsole.cpp b/src/modules/communication/SerialConsole.cpp
index 519db023..301937df 100644
--- a/src/modules/communication/SerialConsole.cpp
+++ b/src/modules/communication/SerialConsole.cpp
@@ -1,8 +1,8 @@
-/*
+/*
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 .
+ You should have received a copy of the GNU General Public License along with Smoothie. If not, see .
*/
#include
@@ -15,14 +15,15 @@ using std::string;
#include "libs/RingBuffer.h"
#include "libs/SerialMessage.h"
#include "libs/StreamOutput.h"
+#include "libs/StreamOutputPool.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 ){
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() {
@@ -31,31 +32,34 @@ void SerialConsole::on_module_loaded() {
// 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
+ THEKERNEL->streams->append_stream(this);
}
-
+
// Called on Serial::RxIrq interrupt, meaning we have received a char
void SerialConsole::on_serial_char_received(){
- if(this->serial->readable()){
+ while(this->serial->readable()){
char received = this->serial->getc();
- //On newline, we have received a line, else concatenate in buffer
- if( received == '\r' ){ return; }
- this->buffer.push_back(received);
+ // convert CR to NL (for host OSs that don't send NL)
+ if( received == '\r' ){ received = '\n'; }
+ this->buffer.push_back(received);
}
}
-
+
// 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->has_char('\n') ){
- int index = 0;
string received;
+ received.reserve(20);
while(1){
char c;
this->buffer.pop_front(c);
if( c == '\n' ){
- struct SerialMessage message;
+ struct SerialMessage message;
message.message = received;
message.stream = this;
- this->kernel->call_event(ON_CONSOLE_LINE_RECEIVED, &message );
+ THEKERNEL->call_event(ON_CONSOLE_LINE_RECEIVED, &message );
return;
}else{
received += c;
@@ -65,19 +69,25 @@ void SerialConsole::on_main_loop(void * argument){
}
-int SerialConsole::printf(const char* format, ...){
- va_list args;
- int result;
- va_start (args, format);
- result = vfprintf( this->serial->_file, format, args);
- va_end (args);
- return result;
+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();
+}
+// Does the queue have a given char ?
bool SerialConsole::has_char(char letter){
- int index = this->buffer.head;
- while( index != this->buffer.tail ){
+ int index = this->buffer.tail;
+ while( index != this->buffer.head ){
if( this->buffer.buffer[index] == letter ){
return true;
}