3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

command: Add command_find_and_dispatch() helper 

Add a helper function that calls command_find_block() followed by
command_dispatch().

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2018-05-24 13:18:03 -04:00
parent c8af3feee6
commit 528f9f7604
5 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/avr/usbserial.c
View File

@ -7,7 +7,7 @@
#include <string.h> // memmove
#include "../lib/pjrc_usb_serial/usb_serial.h"
#include "board/misc.h" // console_sendf
#include "command.h" // command_dispatch
#include "command.h" // command_find_and_dispatch
#include "sched.h" // DECL_INIT
static uint8_t receive_buf[MESSAGE_MAX], receive_pos;
@ -51,9 +51,7 @@ console_task(void)
{
console_check_input();
uint_fast8_t pop_count;
int8_t ret = command_find_block(receive_buf, receive_pos, &pop_count);
if (ret > 0)
command_dispatch(receive_buf, pop_count);
int8_t ret = command_find_and_dispatch(receive_buf, receive_pos, &pop_count);
if (ret)
console_pop_input(pop_count);
}

11
src/command.c
View File

@ -307,3 +307,14 @@ command_dispatch(uint8_t *buf, uint_fast8_t msglen)
func(args);
}
}
// Find a message block and then dispatch all the commands in it
int_fast8_t
command_find_and_dispatch(uint8_t *buf, uint_fast8_t buf_len
, uint_fast8_t *pop_count)
{
int_fast8_t ret = command_find_block(buf, buf_len, pop_count);
if (ret > 0)
command_dispatch(buf, *pop_count);
return ret;
}

2
src/command.h
View File

@ -72,6 +72,8 @@ void command_sendf(const struct command_encoder *ce, ...);
int_fast8_t command_find_block(uint8_t *buf, uint_fast8_t buf_len
, uint_fast8_t *pop_count);
void command_dispatch(uint8_t *buf, uint_fast8_t msglen);
int_fast8_t command_find_and_dispatch(uint8_t *buf, uint_fast8_t buf_len
, uint_fast8_t *pop_count);
// out/compile_time_request.c (auto generated file)
extern const struct command_parser command_index[];

4
src/generic/usb_cdc.c
View File

@ -93,9 +93,7 @@ usb_bulk_out_task(void)
return;
// Process any existing message blocks
uint_fast8_t rpos = receive_pos, pop_count;
int_fast8_t ret = command_find_block(receive_buf, rpos, &pop_count);
if (ret > 0)
command_dispatch(receive_buf, pop_count);
int_fast8_t ret = command_find_and_dispatch(receive_buf, rpos, &pop_count);
if (ret) {
// Move buffer
uint_fast8_t needcopy = rpos - pop_count;

4
src/linux/console.c
View File

@ -156,9 +156,7 @@ console_task(void)
// Find and dispatch message blocks in the input
int len = receive_pos + ret;
uint_fast8_t pop_count, msglen = len > MESSAGE_MAX ? MESSAGE_MAX : len;
ret = command_find_block(receive_buf, msglen, &pop_count);
if (ret > 0)
command_dispatch(receive_buf, pop_count);
ret = command_find_and_dispatch(receive_buf, msglen, &pop_count);
if (ret) {
len -= pop_count;
if (len) {