j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix #472

Browse source
This commit is contained in:
UncleRus 2017-12-02 13:59:11 +05:00
parent a0f846013c
commit 625ab3cc56
2 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
examples/sysparam_editor/FreeRTOSConfig.h Normal file
View file

@ -0,0 +1,12 @@
/* Terminal FreeRTOSConfig overrides.
This is intended as an example of overriding some of the default FreeRTOSConfig settings,
which are otherwise found in FreeRTOS/Source/include/FreeRTOSConfig.h
*/
/* The serial driver depends on counting semaphores */
#define configUSE_COUNTING_SEMAPHORES 1
/* Use the defaults for everything else */
#include_next<FreeRTOSConfig.h>

16
examples/sysparam_editor/sysparam_editor.c
View file

@ -4,6 +4,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sysparam.h> #include <sysparam.h>
#include <unistd.h>
#include <espressif/spi_flash.h> #include <espressif/spi_flash.h>
#include "espressif/esp_common.h" #include "espressif/esp_common.h"
@ -41,12 +42,12 @@ void usage(void) {
size_t tty_readline(char *buffer, size_t buf_size, bool echo) { size_t tty_readline(char *buffer, size_t buf_size, bool echo) {
size_t i = 0; size_t i = 0;
int c; char c;
while (true) { while (true) {
c = getchar(); read(0, (void *)&c, 1);
if (c == '\r' || c == '\n') { if (c == '\r' || c == '\n') {
if (echo) putchar('\n'); if (echo) printf("\n");
break; break;
} else if (c == '\b' || c == 0x7f) { } else if (c == '\b' || c == 0x7f) {
if (i) { if (i) {
@ -56,13 +57,15 @@ size_t tty_readline(char *buffer, size_t buf_size, bool echo) {
} else if (c < 0x20) { } else if (c < 0x20) {
/* Ignore other control characters */ /* Ignore other control characters */
} else if (i >= buf_size - 1) { } else if (i >= buf_size - 1) {
if (echo) putchar('\a'); if (echo) printf("\a");
} else { } else {
buffer[i++] = c; buffer[i++] = c;
if (echo) putchar(c); if (echo) printf("%c", c);
} }
fflush(stdout);
} }
fflush(stdout);
buffer[i] = 0; buffer[i] = 0;
return i; return i;
} }
@ -175,8 +178,10 @@ void sysparam_editor_task(void *pvParameters) {
num_sectors = DEFAULT_SYSPARAM_SECTORS; num_sectors = DEFAULT_SYSPARAM_SECTORS;
base_addr = sdk_flashchip.chip_size - (5 + num_sectors) * sdk_flashchip.sector_size; base_addr = sdk_flashchip.chip_size - (5 + num_sectors) * sdk_flashchip.sector_size;
} }
fflush(stdout);
while (true) { while (true) {
printf("==> "); printf("==> ");
fflush(stdout);
len = tty_readline(cmd_buffer, CMD_BUF_SIZE, echo); len = tty_readline(cmd_buffer, CMD_BUF_SIZE, echo);
status = 0; status = 0;
if (!len) continue; if (!len) continue;
@ -239,6 +244,7 @@ void sysparam_editor_task(void *pvParameters) {
if (status != SYSPARAM_OK) { if (status != SYSPARAM_OK) {
printf("! Operation returned status: %d (%s)\n", status, status_messages[status - status_base]); printf("! Operation returned status: %d (%s)\n", status, status_messages[status - status_base]);
} }
fflush(stdout);
} }
} }