diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2017-10-11 22:36:43 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2017-10-11 22:42:48 +0200 |
| commit | 3f7f97086f6ec8fed3fc09c252943e50d65cb9f2 (patch) | |
| tree | caaae3da7b409e69a5597b8fa6787375aea703ae | |
| parent | 70070f940ab2f9d73ce7feb1f975353b1bf674f7 (diff) | |
more stm32l432stm32l432
| -rw-r--r-- | example-cdc/Makefile | 6 | ||||
| l--------- | example-cdc/board.h | 2 | ||||
| -rw-r--r-- | example-cdc/sample.c | 25 | ||||
| -rw-r--r-- | example-cdc/usb-cdc.c | 2 | ||||
| -rw-r--r-- | example-led/Makefile | 12 | ||||
| l--------- | example-led/board.h | 2 | ||||
| -rw-r--r-- | example-led/sample.c | 1 |
7 files changed, 37 insertions, 13 deletions
diff --git a/example-cdc/Makefile b/example-cdc/Makefile index 4eebd81..7d0bba8 100644 --- a/example-cdc/Makefile +++ b/example-cdc/Makefile @@ -6,7 +6,7 @@ CHOPSTX = .. LDSCRIPT= sample.ld CSRC = sample.c usb-cdc.c -CHIP=stm32f103 +CHIP=stm32l432 USE_SYS = yes USE_USB = yes @@ -17,9 +17,9 @@ CC = $(CROSS)gcc LD = $(CROSS)gcc OBJCOPY = $(CROSS)objcopy -MCU = cortex-m3 +MCU = cortex-m4 CWARN = -Wall -Wextra -Wstrict-prototypes -DEFS = -DUSE_SYS3 -DFREE_STANDING +DEFS = -DUSE_SYS3 -DFREE_STANDING -DMHZ=80 OPT = -O3 -Os -g LIBS = diff --git a/example-cdc/board.h b/example-cdc/board.h index b673327..8075a6c 120000 --- a/example-cdc/board.h +++ b/example-cdc/board.h @@ -1 +1 @@ -../board/board-fst-01.h
\ No newline at end of file +../board/board-st-nucleo-l432.h
\ No newline at end of file diff --git a/example-cdc/sample.c b/example-cdc/sample.c index 13860e7..9948179 100644 --- a/example-cdc/sample.c +++ b/example-cdc/sample.c @@ -10,6 +10,8 @@ #include "board.h" #include "sys.h" +#include "mcu/stm32l432.h" + static chopstx_mutex_t mtx; static chopstx_cond_t cnd0; static chopstx_cond_t cnd1; @@ -92,6 +94,10 @@ main (int argc, const char *argv[]) (void)argc; (void)argv; + RNG->CR |= 1 << 2; + while (!(RNG->SR & 1)) + ; + chopstx_mutex_init (&mtx); chopstx_cond_init (&cnd0); chopstx_cond_init (&cnd1); @@ -157,7 +163,24 @@ main (int argc, const char *argv[]) s[size + 5] = '\n'; if (tty_send (tty, s, size + 6) < 0) break; - } + + uint32_t data; + while (!(RNG->SR & 1)) + ; + data = RNG->DR; + s[0] = hexchar ((data >> 28) & 0xf); + s[1] = hexchar ((data >> 24) & 0xf); + s[2] = hexchar ((data >> 20) & 0xf); + s[3] = hexchar ((data >> 16) & 0xf); + s[4] = hexchar ((data >> 12) & 0xf); + s[5] = hexchar ((data >> 8) & 0xf); + s[6] = hexchar ((data >> 4) & 0xf); + s[7] = hexchar ((data >> 0) & 0xf); + s[8] = '\r'; + s[9] = '\n'; + if (tty_send (tty, s, 10) < 0) + break; + } u ^= 1; } diff --git a/example-cdc/usb-cdc.c b/example-cdc/usb-cdc.c index cdad7dc..3057a64 100644 --- a/example-cdc/usb-cdc.c +++ b/example-cdc/usb-cdc.c @@ -639,7 +639,7 @@ usb_rx_ready (uint8_t ep_num, uint16_t len) static void *tty_main (void *arg); -#define INTR_REQ_USB 20 +#define INTR_REQ_USB 67 #define PRIO_TTY 4 #define STACK_PROCESS_3 diff --git a/example-led/Makefile b/example-led/Makefile index d7d978c..ac96585 100644 --- a/example-led/Makefile +++ b/example-led/Makefile @@ -6,11 +6,11 @@ PROJECT = sample ### Please change lines started with '###' for Cortex-M3 board. CHOPSTX = .. -LDSCRIPT= sample.ld -### LDSCRIPT= sample.ld.m3 +LDSCRIPT= sample.ld.m4 +### LDSCRIPT= sample.ld CSRC = sample.c -CHIP=stm32f0 +CHIP=stm32l432 USE_SYS = yes ################################### @@ -19,10 +19,10 @@ CC = $(CROSS)gcc LD = $(CROSS)gcc OBJCOPY = $(CROSS)objcopy -### MCU = cortex-m3 -MCU = cortex-m0 +MCU = cortex-m4 +### MCU = cortex-m0 CWARN = -Wall -Wextra -Wstrict-prototypes -DEFS = -DUSE_SYS3 -DFREE_STANDING -DMHZ=48 +DEFS = -DUSE_SYS3 -DFREE_STANDING -DMHZ=80 ### DEFS = -DFREE_STANDING -DUSE_SYS3 -DBUSY_LOOP -DCHX_FLAGS_MAIN=CHOPSTX_SCHED_RR OPT = -O3 -Os -g LIBS = diff --git a/example-led/board.h b/example-led/board.h index 25f9e69..8075a6c 120000 --- a/example-led/board.h +++ b/example-led/board.h @@ -1 +1 @@ -../board/board-stm32f0-discovery.h
\ No newline at end of file +../board/board-st-nucleo-l432.h
\ No newline at end of file diff --git a/example-led/sample.c b/example-led/sample.c index f346676..ae6325a 100644 --- a/example-led/sample.c +++ b/example-led/sample.c @@ -1,6 +1,7 @@ #include <stdint.h> #include <stdlib.h> #include <chopstx.h> +#include "board.h" #include "sys.h" /* for set_led */ static chopstx_mutex_t mtx; |