moved cflags from MCU to BSP as they were non-functional, implemented suggestion for console read
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/ecf379be Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/ecf379be Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/ecf379be Branch: refs/heads/bluetooth5 Commit: ecf379bea71f943752765fa48f3c890dad505119 Parents: 0a5821d Author: julian <julian.ing...@imgtec.com> Authored: Tue May 2 14:14:19 2017 +0100 Committer: julian <julian.ing...@imgtec.com> Committed: Thu May 4 16:58:45 2017 +0100 ---------------------------------------------------------------------- hw/bsp/pic32mx470_6lp_clicker/pkg.yml | 4 +++- hw/bsp/pic32mz2048_wi-fire/pkg.yml | 2 ++ hw/mcu/microchip/pic32mx470f512h/pkg.yml | 2 -- hw/mcu/microchip/pic32mz2048efg100/pkg.yml | 2 -- sys/console/full/src/console.c | 4 ++-- sys/console/minimal/src/console.c | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/ecf379be/hw/bsp/pic32mx470_6lp_clicker/pkg.yml ---------------------------------------------------------------------- diff --git a/hw/bsp/pic32mx470_6lp_clicker/pkg.yml b/hw/bsp/pic32mx470_6lp_clicker/pkg.yml index 2e4242c..3b3db18 100644 --- a/hw/bsp/pic32mx470_6lp_clicker/pkg.yml +++ b/hw/bsp/pic32mx470_6lp_clicker/pkg.yml @@ -26,7 +26,9 @@ pkg.keywords: - pic32 - microchip - clicker - + +pkg.cflags: + - -mprocessor=32MX470F512H pkg.lflags: - -Wl,--defsym=_min_heap_size=0x400 http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/ecf379be/hw/bsp/pic32mz2048_wi-fire/pkg.yml ---------------------------------------------------------------------- diff --git a/hw/bsp/pic32mz2048_wi-fire/pkg.yml b/hw/bsp/pic32mz2048_wi-fire/pkg.yml index ebd831b..f5f4827 100644 --- a/hw/bsp/pic32mz2048_wi-fire/pkg.yml +++ b/hw/bsp/pic32mz2048_wi-fire/pkg.yml @@ -27,6 +27,8 @@ pkg.keywords: - microchip - clicker +pkg.cflags: + - -mprocessor=32MZ2048EFG100 pkg.lflags: - -Wl,--defsym=_min_heap_size=0x400 http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/ecf379be/hw/mcu/microchip/pic32mx470f512h/pkg.yml ---------------------------------------------------------------------- diff --git a/hw/mcu/microchip/pic32mx470f512h/pkg.yml b/hw/mcu/microchip/pic32mx470f512h/pkg.yml index 824984e..a2497e1 100644 --- a/hw/mcu/microchip/pic32mx470f512h/pkg.yml +++ b/hw/mcu/microchip/pic32mx470f512h/pkg.yml @@ -24,8 +24,6 @@ pkg.homepage: "http://mynewt.apache.org/"; pkg.keywords: - pic32 -pkg.cflags: - - -mprocessor=32MX470F512H pkg.deps: - hw/hal - compiler/xc32 http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/ecf379be/hw/mcu/microchip/pic32mz2048efg100/pkg.yml ---------------------------------------------------------------------- diff --git a/hw/mcu/microchip/pic32mz2048efg100/pkg.yml b/hw/mcu/microchip/pic32mz2048efg100/pkg.yml index a3ad428..cbd4d4c 100644 --- a/hw/mcu/microchip/pic32mz2048efg100/pkg.yml +++ b/hw/mcu/microchip/pic32mz2048efg100/pkg.yml @@ -24,8 +24,6 @@ pkg.homepage: "http://mynewt.apache.org/"; pkg.keywords: - pic32 -pkg.cflags: - - -mprocessor=32MZ2048EFG100 pkg.deps: - hw/hal - compiler/xc32 http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/ecf379be/sys/console/full/src/console.c ---------------------------------------------------------------------- diff --git a/sys/console/full/src/console.c b/sys/console/full/src/console.c index 389d92f..c9d81f1 100644 --- a/sys/console/full/src/console.c +++ b/sys/console/full/src/console.c @@ -116,8 +116,8 @@ console_read(char *str, int cnt, int *newline) } cmd = ev->ev_arg; len = strlen(cmd->line); - if (cnt < len) { - len = cnt; + if ((cnt - 1) < len) { + len = cnt - 1; } memcpy(str, cmd->line, len); str[len] = '\0'; http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/ecf379be/sys/console/minimal/src/console.c ---------------------------------------------------------------------- diff --git a/sys/console/minimal/src/console.c b/sys/console/minimal/src/console.c index 21f9d20..0b88ab9 100644 --- a/sys/console/minimal/src/console.c +++ b/sys/console/minimal/src/console.c @@ -86,8 +86,8 @@ console_read(char *str, int cnt, int *newline) } cmd = ev->ev_arg; len = strlen(cmd->line); - if (cnt < len) { - len = cnt; + if ((cnt - 1) < len) { + len = cnt - 1; } memcpy(str, cmd->line, len); str[len] = '\0';
