From 0f80087ee76a73bd5295601793fc6b2c924667b3 Mon Sep 17 00:00:00 2001 From: matt-bull Date: Wed, 27 Jan 2016 20:59:37 -0600 Subject: [PATCH] Have PS3.printStatusString() print to a new line each time it is called. --- PS3BT.cpp | 8 ++++---- PS3USB.cpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/PS3BT.cpp b/PS3BT.cpp index cf1670bb..742591fa 100644 --- a/PS3BT.cpp +++ b/PS3BT.cpp @@ -158,9 +158,9 @@ bool PS3BT::getStatus(StatusEnum c) { } void PS3BT::printStatusString() { - char statusOutput[100]; // Max string length plus null character + char statusOutput[102]; // Max string length plus null character if(PS3Connected || PS3NavigationConnected) { - strcpy_P(statusOutput, PSTR("ConnectionStatus: ")); + strcpy_P(statusOutput, PSTR("\r\nConnectionStatus: ")); if(getStatus(Plugged)) strcat_P(statusOutput, PSTR("Plugged")); else if(getStatus(Unplugged)) strcat_P(statusOutput, PSTR("Unplugged")); @@ -185,7 +185,7 @@ void PS3BT::printStatusString() { else if(getStatus(Bluetooth)) strcat_P(statusOutput, PSTR("Bluetooth - Rumble is off")); else strcat_P(statusOutput, PSTR("Error")); } else if(PS3MoveConnected) { - strcpy_P(statusOutput, PSTR("PowerRating: ")); + strcpy_P(statusOutput, PSTR("\r\nPowerRating: ")); if(getStatus(MoveCharging)) strcat_P(statusOutput, PSTR("Charging")); else if(getStatus(MoveNotCharging)) strcat_P(statusOutput, PSTR("Not Charging")); @@ -196,7 +196,7 @@ void PS3BT::printStatusString() { else if(getStatus(MoveFull)) strcat_P(statusOutput, PSTR("Full")); else strcat_P(statusOutput, PSTR("Error")); } else - strcpy_P(statusOutput, PSTR("Error")); + strcpy_P(statusOutput, PSTR("\r\nError")); USB_HOST_SERIAL.write(statusOutput); } diff --git a/PS3USB.cpp b/PS3USB.cpp index c263613a..cfa5f978 100755 --- a/PS3USB.cpp +++ b/PS3USB.cpp @@ -362,9 +362,9 @@ bool PS3USB::getStatus(StatusEnum c) { } void PS3USB::printStatusString() { - char statusOutput[100]; // Max string length plus null character + char statusOutput[102]; // Max string length plus null character if(PS3Connected || PS3NavigationConnected) { - strcpy_P(statusOutput, PSTR("ConnectionStatus: ")); + strcpy_P(statusOutput, PSTR("\r\nConnectionStatus: ")); if(getStatus(Plugged)) strcat_P(statusOutput, PSTR("Plugged")); else if(getStatus(Unplugged)) strcat_P(statusOutput, PSTR("Unplugged")); @@ -389,7 +389,7 @@ void PS3USB::printStatusString() { else if(getStatus(Bluetooth)) strcat_P(statusOutput, PSTR("Bluetooth - Rumble is off")); else strcat_P(statusOutput, PSTR("Error")); } else - strcpy_P(statusOutput, PSTR("Error")); + strcpy_P(statusOutput, PSTR("\r\nError")); USB_HOST_SERIAL.write(statusOutput); }