From 9326040b4845a28c66e1d7742bb99e685ecafceb Mon Sep 17 00:00:00 2001 From: Jim Morris Date: Tue, 15 Apr 2014 20:07:29 -0700 Subject: [PATCH] fix case where mri is not loaded for serial. --- src/libs/Kernel.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/libs/Kernel.cpp b/src/libs/Kernel.cpp index 923d4f91..3676d9fa 100644 --- a/src/libs/Kernel.cpp +++ b/src/libs/Kernel.cpp @@ -44,7 +44,7 @@ Kernel::Kernel(){ // serial first at fixed baud rate (MRI_BAUD) so config can report errors to serial // Set to UART0, this will be changed to use the same UART as MRI if it's enabled - this->serial = new SerialConsole(USBTX, USBRX, 115200); + this->serial = new SerialConsole(USBTX, USBRX, 115200); // Config next, but does not load cache yet this->config = new Config(); @@ -54,6 +54,7 @@ Kernel::Kernel(){ // now config is loaded we can do normal setup for serial and the rest delete this->serial; + this->serial= NULL; this->streams = new StreamOutputPool(); @@ -79,6 +80,10 @@ Kernel::Kernel(){ } } + if(this->serial == NULL) { + this->serial = new SerialConsole(USBTX, USBRX, this->config->value(uart0_checksum,baud_rate_setting_checksum)->by_default(9600)->as_number()); + } + this->add_module( this->config ); this->add_module( this->serial ); -- 2.20.1