HR/EMS31_submodules
Template
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: HR:62f45f725623cb0b1e7a851c96ee94a8a71bc16c
Branches Tags
HR:master
HR:esp-idf
HR:multie-cli
HR:finley
HR:Dennis_buffer
...
compare: HR:9c30ea4ef1e9c107954f76cac700d0a18e7e5858
Branches Tags
HR:esp-idf
HR:multie-cli
HR:master
HR:finley
HR:Dennis_buffer

6 Commits
62f45f7256 ... 9c30ea4ef1

Author SHA1 Message Date
FReenen
9c30ea4ef1 Merge branch 'master' 2024-04-14 22:50:18 +02:00
Dennis Boekholtz
92eb70f4b5 Merge branch 'Dennis_CCS' 2024-04-14 21:10:48 +02:00
Dennis Boekholtz
cb7b573eed Merge branch 'master' into Dennis_CCS 2024-04-14 21:10:15 +02:00
Dennis Boekholtz
04eebfc3fc CLI & History features aan gezet en werkende gekregen op CC3220 2024-04-14 21:09:20 +02:00
Dennis Boekholtz
51c1c28756 Merge branch 'Dennis_CCS' 2024-04-14 15:00:33 +02:00
Dennis Boekholtz
cd72e519a1 Merge branch 'master' into Dennis_CCS 2024-04-14 14:57:10 +02:00
2 changed files with 7 additions and 3 deletions
Show Stats Expand all files Collapse all files

4
CLI/CLI.c
View File

@ -96,9 +96,10 @@ void CLI_PrintHistory()
{
char** historyList;
int ret = History_getFullHistory(History, &historyList);
int i;
if (ret >= 0)
{
for (int i=0; *(historyList + i) != NULL; i++)
for (i=0; *(historyList + i) != NULL; i++)
{
printf("%03i: %s\n", i, *(historyList + i));
}
@ -263,6 +264,7 @@ bool CLI_charIn(char c)
FIFOBuffChar_delete(fifo);
break;
case 8:
case 127: // backspace
if (FIFOBuffChar_pop(FIFO))
{ // pop something of the buffer

6
History/History.c
View File

@ -153,7 +153,8 @@ int History_getFullHistory(History_t* history, char*** list)
*list = malloc(sizeof(char**) * (History_getSize(history) + 1));
History_element_t* el = history->FirstEl_p;
for (int i = 0; (i < History_getSize(history)-1) && (retCode >= 0); i++)
int i;
for (i = 0; (i < History_getSize(history)-1) && (retCode >= 0); i++)
{
*((*list) + i) = el->line;
if (el->nextEl_p == NULL)
@ -182,7 +183,8 @@ int History_getCurrPos(History_t* history)
if (history->CurrEl_p != NULL)
{
History_element_t* el = history->FirstEl_p;
for (int i = 0; (el != history->CurrEl_p) && (retCode >= 0); i++)
int i;
for (i = 0; (el != history->CurrEl_p) && (retCode >= 0); i++)
{
if (el->nextEl_p == NULL)
{