aboutsummaryrefslogtreecommitdiff
path: root/cc3200/telnet
diff options
context:
space:
mode:
authorDaniel Campora2015-03-26 13:51:37 +0100
committerDaniel Campora2015-03-26 13:58:58 +0100
commit4be44014abd5804e3cd8f810b67ad5555af47f13 (patch)
treec9a9f55da29f12b1c7d4b487324fbc96c3156194 /cc3200/telnet
parent0090c714ba94a10b21d8a09756d7d6f7354ac3f9 (diff)
cc3200: Reenable active interrupts when waking from suspended mode.
Diffstat (limited to 'cc3200/telnet')
-rw-r--r--cc3200/telnet/telnet.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/cc3200/telnet/telnet.c b/cc3200/telnet/telnet.c
index ece15c6c7..5d038866f 100644
--- a/cc3200/telnet/telnet.c
+++ b/cc3200/telnet/telnet.c
@@ -110,7 +110,7 @@ static telnet_data_t telnet_data;
static const char* telnet_welcome_msg = "Micro Python " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME "\r\n";
static const char* telnet_request_user = "Login as:";
static const char* telnet_request_password = "Password:";
-static const char* telnet_invalid_loggin = "\r\nInvalid credentials, try again\r\n";
+static const char* telnet_invalid_loggin = "\r\nInvalid credentials, try again.\r\n";
static const char* telnet_loggin_success = "\r\nLogin succeeded!\r\nType \"help()\" for more information.\r\n";
static const uint8_t telnet_options_user[] = // IAC WONT ECHO IAC WONT SUPPRESS_GO_AHEAD IAC WILL LINEMODE
{ 255, 252, 1, 255, 252, 3, 255, 251, 34 };
@@ -217,10 +217,8 @@ void telnet_run (void) {
break;
case E_TELNET_STE_SUB_LOGGIN_SUCCESS:
if (E_TELNET_RESULT_OK == telnet_send_non_blocking((void *)telnet_loggin_success, strlen(telnet_loggin_success))) {
- // clear the current line
+ // clear the current line and force the prompt
telnet_reset_buffer();
- // fake an "enter" key pressed to display the prompt
- telnet_data.rxBuffer[telnet_data.rxWindex++] = '\r';
telnet_data.state= E_TELNET_STE_LOGGED_IN;
}
default:
@@ -478,7 +476,10 @@ static void telnet_reset (void) {
}
static void telnet_reset_buffer (void) {
+ // erase any characters present in the current line
memset (telnet_data.rxBuffer, '\b', TELNET_RX_BUFFER_SIZE / 2);
telnet_data.rxWindex = TELNET_RX_BUFFER_SIZE / 2;
+ // fake an "enter" key pressed to display the prompt
+ telnet_data.rxBuffer[telnet_data.rxWindex++] = '\r';
}