From 269600d8753dd78d828484ba98f662fedf0ce37c Mon Sep 17 00:00:00 2001 From: "Sergio R. Caprile" Date: Wed, 4 Sep 2024 17:13:19 -0300 Subject: [PATCH 1/2] pilot move --- .../Makefile | 48 ++--- .../README.md | 4 +- .../hal.h | 164 ------------------ .../link.ld | 29 ---- .../main.c | 72 -------- .../mongoose.c | 1 - .../mongoose.h | 1 - .../mongoose_config.h | 11 -- .../net.c | 1 - .../net.h | 1 - .../packed_fs.c | 1 - .../syscalls.c | 88 ---------- .../sysinit.c | 29 ---- 13 files changed, 14 insertions(+), 436 deletions(-) delete mode 100644 examples/stm32/nucleo-f429zi-make-baremetal-builtin/hal.h delete mode 100644 examples/stm32/nucleo-f429zi-make-baremetal-builtin/link.ld delete mode 100644 examples/stm32/nucleo-f429zi-make-baremetal-builtin/main.c delete mode 120000 examples/stm32/nucleo-f429zi-make-baremetal-builtin/mongoose.c delete mode 120000 examples/stm32/nucleo-f429zi-make-baremetal-builtin/mongoose.h delete mode 100644 examples/stm32/nucleo-f429zi-make-baremetal-builtin/mongoose_config.h delete mode 120000 examples/stm32/nucleo-f429zi-make-baremetal-builtin/net.c delete mode 120000 examples/stm32/nucleo-f429zi-make-baremetal-builtin/net.h delete mode 120000 examples/stm32/nucleo-f429zi-make-baremetal-builtin/packed_fs.c delete mode 100644 examples/stm32/nucleo-f429zi-make-baremetal-builtin/syscalls.c delete mode 100644 examples/stm32/nucleo-f429zi-make-baremetal-builtin/sysinit.c diff --git a/examples/stm32/nucleo-f429zi-make-baremetal-builtin/Makefile b/examples/stm32/nucleo-f429zi-make-baremetal-builtin/Makefile index 5052d35809..e16acb0559 100644 --- a/examples/stm32/nucleo-f429zi-make-baremetal-builtin/Makefile +++ b/examples/stm32/nucleo-f429zi-make-baremetal-builtin/Makefile @@ -1,51 +1,29 @@ -CFLAGS = -W -Wall -Wextra -Werror -Wundef -Wshadow -Wdouble-promotion -CFLAGS += -Wformat-truncation -fno-common -Wconversion -Wno-sign-conversion -CFLAGS += -g3 -Os -ffunction-sections -fdata-sections -CFLAGS += -I. -Icmsis_core/CMSIS/Core/Include -Icmsis_f4/Include -CFLAGS += -mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 $(CFLAGS_EXTRA) -LDFLAGS ?= -Tlink.ld -nostdlib -nostartfiles --specs nano.specs -lc -lgcc -Wl,--gc-sections -Wl,-Map=$@.map - -SOURCES = main.c syscalls.c sysinit.c -SOURCES += cmsis_f4/Source/Templates/gcc/startup_stm32f429xx.s # ST startup file. Compiler-dependent! - -# Mongoose options are defined in mongoose_config.h -SOURCES += mongoose.c net.c packed_fs.c - -# Example specific build options. See README.md -CFLAGS += -DHTTP_URL=\"http://0.0.0.0/\" - -ifeq ($(OS),Windows_NT) - RM = cmd /C del /Q /F /S -else - RM = rm -rf -endif +BOARD = f429 +IDE = GCC+make +RTOS = baremetal +WIZARD_URL ?= http://mongoose.ws/wizard all build example: firmware.bin -firmware.bin: firmware.elf - arm-none-eabi-objcopy -O binary $< $@ - -firmware.elf: cmsis_core cmsis_f4 $(SOURCES) hal.h link.ld - arm-none-eabi-gcc $(SOURCES) $(CFLAGS) $(LDFLAGS) -o $@ +firmware.bin: wizard + make -C wizard CFLAGS_EXTRA=$(CFLAGS_EXTRA) && mv wizard/firmware.bin ./ -flash: firmware.bin - st-flash --reset write $< 0x8000000 +wizard: + hash=$$(curl -s -X POST -H "Content-Type: application/json" -d '{"build":{"board":"$(BOARD)","ide":"$(IDE)","rtos":"$(RTOS)"}}' $(WIZARD_URL)/api/hash | jq -r '.hash') \ + && curl -s $(WIZARD_URL)/api/zip/$(BOARD)/$(IDE)/$(RTOS)/$$hash -o wizard.zip + unzip wizard.zip + cd wizard ; rm mongoose.[ch] ; ln -s ../../../../mongoose.c ; ln -s ../../../../mongoose.h -cmsis_core: # ARM CMSIS core headers - git clone --depth 1 -b 5.9.0 https://github.com/ARM-software/CMSIS_5 $@ -cmsis_f4: # ST CMSIS headers for STM32F4 series - git clone --depth 1 -b v2.6.8 https://github.com/STMicroelectronics/cmsis_device_f4 $@ # Automated remote test. Requires env variable VCON_API_KEY set. See https://vcon.io/automated-firmware-tests/ DEVICE_URL ?= https://dash.vcon.io/api/v3/devices/2 update: firmware.bin curl --fail-with-body -su :$(VCON_API_KEY) $(DEVICE_URL)/ota --data-binary @$< -test update: CFLAGS += -DUART_DEBUG=USART1 +test update: CFLAGS_EXTRA ="-DUART_DEBUG=USART1" test: update curl --fail-with-body -su :$(VCON_API_KEY) $(DEVICE_URL)/tx?t=5 | tee /tmp/output.txt grep 'READY, IP:' /tmp/output.txt # Check for network init -# grep 'MQTT connected' /tmp/output.txt # Check for MQTT connection success clean: - $(RM) firmware.* *.su cmsis_core cmsis_f4 + rm -rf firmware.* wizard* diff --git a/examples/stm32/nucleo-f429zi-make-baremetal-builtin/README.md b/examples/stm32/nucleo-f429zi-make-baremetal-builtin/README.md index cb49b01586..d939446433 100644 --- a/examples/stm32/nucleo-f429zi-make-baremetal-builtin/README.md +++ b/examples/stm32/nucleo-f429zi-make-baremetal-builtin/README.md @@ -1,3 +1 @@ -# Baremetal web device dashboard on NUCLEO-F429ZI - -See https://mongoose.ws/tutorials/stm32/all-make-baremetal-builtin/ +See [Wizard](https://mongoose.ws/wizard/#/output?board=f429&ide=GCC+make&rtos=baremetal&file=README.md) diff --git a/examples/stm32/nucleo-f429zi-make-baremetal-builtin/hal.h b/examples/stm32/nucleo-f429zi-make-baremetal-builtin/hal.h deleted file mode 100644 index cffabf4db3..0000000000 --- a/examples/stm32/nucleo-f429zi-make-baremetal-builtin/hal.h +++ /dev/null @@ -1,164 +0,0 @@ -// Copyright (c) 2022 Cesanta Software Limited -// All rights reserved -// https://www.st.com/resource/en/reference_manual/dm00031020-stm32f405-415-stm32f407-417-stm32f427-437-and-stm32f429-439-advanced-arm-based-32-bit-mcus-stmicroelectronics.pdf -// https://www.st.com/resource/en/datasheet/stm32f429zi.pdf - -#pragma once - -#include - -#include -#include -#include -#include - - -#define BIT(x) (1UL << (x)) -#define SETBITS(R, CLEARMASK, SETMASK) (R) = ((R) & ~(CLEARMASK)) | (SETMASK) -#define PIN(bank, num) ((((bank) - 'A') << 8) | (num)) -#define PINNO(pin) (pin & 255) -#define PINBANK(pin) (pin >> 8) - -#define LED1 PIN('B', 0) // On-board LED pin (green) -#define LED2 PIN('B', 7) // On-board LED pin (blue) -#define LED3 PIN('B', 14) // On-board LED pin (red) - -#define LED LED2 // Use blue LED for blinking - -// 6.3.3: APB1 clock <= 45MHz; APB2 clock <= 90MHz -// 3.5.1, Table 11: configure flash latency (WS) in accordance to clock freq -// 33.4: The AHB clock must be at least 25 MHz when Ethernet is used -enum { APB1_PRE = 5 /* AHB clock / 4 */, APB2_PRE = 4 /* AHB clock / 2 */ }; -enum { PLL_HSI = 16, PLL_M = 8, PLL_N = 180, PLL_P = 2 }; // Run at 180 Mhz -#define FLASH_LATENCY 5 -#define SYS_FREQUENCY ((PLL_HSI * PLL_N / PLL_M / PLL_P) * 1000000) -#define APB2_FREQUENCY (SYS_FREQUENCY / (BIT(APB2_PRE - 3))) -#define APB1_FREQUENCY (SYS_FREQUENCY / (BIT(APB1_PRE - 3))) - -static inline void spin(volatile uint32_t count) { - while (count--) (void) 0; -} - -enum { GPIO_MODE_INPUT, GPIO_MODE_OUTPUT, GPIO_MODE_AF, GPIO_MODE_ANALOG }; -enum { GPIO_OTYPE_PUSH_PULL, GPIO_OTYPE_OPEN_DRAIN }; -enum { GPIO_SPEED_LOW, GPIO_SPEED_MEDIUM, GPIO_SPEED_HIGH, GPIO_SPEED_INSANE }; -enum { GPIO_PULL_NONE, GPIO_PULL_UP, GPIO_PULL_DOWN }; -#define GPIO(N) ((GPIO_TypeDef *) (0x40020000 + 0x400 * (N))) - -static GPIO_TypeDef *gpio_bank(uint16_t pin) { return GPIO(PINBANK(pin)); } -static inline void gpio_toggle(uint16_t pin) { - GPIO_TypeDef *gpio = gpio_bank(pin); - uint32_t mask = BIT(PINNO(pin)); - gpio->BSRR = mask << (gpio->ODR & mask ? 16 : 0); -} -static inline int gpio_read(uint16_t pin) { - return gpio_bank(pin)->IDR & BIT(PINNO(pin)) ? 1 : 0; -} -static inline void gpio_write(uint16_t pin, bool val) { - GPIO_TypeDef *gpio = gpio_bank(pin); - gpio->BSRR = BIT(PINNO(pin)) << (val ? 0 : 16); -} -static inline void gpio_init(uint16_t pin, uint8_t mode, uint8_t type, - uint8_t speed, uint8_t pull, uint8_t af) { - GPIO_TypeDef *gpio = gpio_bank(pin); - uint8_t n = (uint8_t) (PINNO(pin)); - RCC->AHB1ENR |= BIT(PINBANK(pin)); // Enable GPIO clock - SETBITS(gpio->OTYPER, 1UL << n, ((uint32_t) type) << n); - SETBITS(gpio->OSPEEDR, 3UL << (n * 2), ((uint32_t) speed) << (n * 2)); - SETBITS(gpio->PUPDR, 3UL << (n * 2), ((uint32_t) pull) << (n * 2)); - SETBITS(gpio->AFR[n >> 3], 15UL << ((n & 7) * 4), - ((uint32_t) af) << ((n & 7) * 4)); - SETBITS(gpio->MODER, 3UL << (n * 2), ((uint32_t) mode) << (n * 2)); -} -static inline void gpio_input(uint16_t pin) { - gpio_init(pin, GPIO_MODE_INPUT, GPIO_OTYPE_PUSH_PULL, GPIO_SPEED_HIGH, - GPIO_PULL_NONE, 0); -} -static inline void gpio_output(uint16_t pin) { - gpio_init(pin, GPIO_MODE_OUTPUT, GPIO_OTYPE_PUSH_PULL, GPIO_SPEED_HIGH, - GPIO_PULL_NONE, 0); -} - -static inline void irq_exti_attach(uint16_t pin) { - uint8_t bank = (uint8_t) (PINBANK(pin)), n = (uint8_t) (PINNO(pin)); - SYSCFG->EXTICR[n / 4] &= ~(15UL << ((n % 4) * 4)); - SYSCFG->EXTICR[n / 4] |= (uint32_t) (bank << ((n % 4) * 4)); - EXTI->IMR |= BIT(n); - EXTI->RTSR |= BIT(n); - EXTI->FTSR |= BIT(n); - int irqvec = n < 5 ? 6 + n : n < 10 ? 23 : 40; // IRQ vector index, 10.1.2 - NVIC_SetPriority(irqvec, 3); - NVIC_EnableIRQ(irqvec); -} - -#ifndef UART_DEBUG -#define UART_DEBUG USART3 -#endif - -static inline void uart_init(USART_TypeDef *uart, unsigned long baud) { - uint8_t af = 7; // Alternate function - uint16_t rx = 0, tx = 0; // pins - uint32_t freq = 0; // Bus frequency. UART1 is on APB2, rest on APB1 - - if (uart == USART1) freq = APB2_FREQUENCY, RCC->APB2ENR |= BIT(4); - if (uart == USART2) freq = APB1_FREQUENCY, RCC->APB1ENR |= BIT(17); - if (uart == USART3) freq = APB1_FREQUENCY, RCC->APB1ENR |= BIT(18); - - if (uart == USART1) tx = PIN('A', 9), rx = PIN('A', 10); - if (uart == USART2) tx = PIN('A', 2), rx = PIN('A', 3); - if (uart == USART3) tx = PIN('D', 8), rx = PIN('D', 9); - - gpio_init(tx, GPIO_MODE_AF, GPIO_OTYPE_PUSH_PULL, GPIO_SPEED_HIGH, 0, af); - gpio_init(rx, GPIO_MODE_AF, GPIO_OTYPE_PUSH_PULL, GPIO_SPEED_HIGH, 0, af); - uart->CR1 = 0; // Disable this UART - uart->BRR = freq / baud; // Set baud rate - uart->CR1 |= BIT(13) | BIT(2) | BIT(3); // Set UE, RE, TE -} -static inline void uart_write_byte(USART_TypeDef *uart, uint8_t byte) { - uart->DR = byte; - while ((uart->SR & BIT(7)) == 0) spin(1); -} -static inline void uart_write_buf(USART_TypeDef *uart, char *buf, size_t len) { - while (len-- > 0) uart_write_byte(uart, *(uint8_t *) buf++); -} -static inline int uart_read_ready(USART_TypeDef *uart) { - return uart->SR & BIT(5); // If RXNE bit is set, data is ready -} -static inline uint8_t uart_read_byte(USART_TypeDef *uart) { - return (uint8_t) (uart->DR & 255); -} - -static inline void rng_init(void) { - RCC->AHB2ENR |= RCC_AHB2ENR_RNGEN; - RNG->CR |= RNG_CR_RNGEN; -} -static inline uint32_t rng_read(void) { - while ((RNG->SR & RNG_SR_DRDY) == 0) (void) 0; - return RNG->DR; -} - -// Hw pull-ups on PHY RXD0,1,DV to enable autonegotiation -static inline void ethernet_init(void) { - // Initialise Ethernet. Enable MAC GPIO pins, see - // https://www.farnell.com/datasheets/2014265.pdf section 6.10 - uint16_t pins[] = {PIN('A', 1), PIN('A', 2), PIN('A', 7), - PIN('B', 13), PIN('C', 1), PIN('C', 4), - PIN('C', 5), PIN('G', 11), PIN('G', 13)}; - for (size_t i = 0; i < sizeof(pins) / sizeof(pins[0]); i++) { - gpio_init(pins[i], GPIO_MODE_AF, GPIO_OTYPE_PUSH_PULL, GPIO_SPEED_INSANE, - GPIO_PULL_NONE, 11); // 11 is the Ethernet function - } - NVIC_EnableIRQ(ETH_IRQn); // Setup Ethernet IRQ handler - SYSCFG->PMC |= SYSCFG_PMC_MII_RMII_SEL; // Use RMII. Goes first! - RCC->AHB1ENR |= - RCC_AHB1ENR_ETHMACEN | RCC_AHB1ENR_ETHMACTXEN | RCC_AHB1ENR_ETHMACRXEN; -} - -#define UUID ((uint8_t *) UID_BASE) // Unique 96-bit chip ID. TRM 39.1 - -// Helper macro for MAC generation -#define GENERATE_LOCALLY_ADMINISTERED_MAC() \ - { \ - 2, UUID[0] ^ UUID[1], UUID[2] ^ UUID[3], UUID[4] ^ UUID[5], \ - UUID[6] ^ UUID[7] ^ UUID[8], UUID[9] ^ UUID[10] ^ UUID[11] \ - } diff --git a/examples/stm32/nucleo-f429zi-make-baremetal-builtin/link.ld b/examples/stm32/nucleo-f429zi-make-baremetal-builtin/link.ld deleted file mode 100644 index b973269bc0..0000000000 --- a/examples/stm32/nucleo-f429zi-make-baremetal-builtin/link.ld +++ /dev/null @@ -1,29 +0,0 @@ -ENTRY(Reset_Handler); -MEMORY { - flash(rx) : ORIGIN = 0x08000000, LENGTH = 2048k - sram(rwx) : ORIGIN = 0x20000000, LENGTH = 192k /* remaining 64k in a separate address space */ -} -_estack = ORIGIN(sram) + LENGTH(sram); /* stack points to end of SRAM */ - -SECTIONS { - .vectors : { KEEP(*(.isr_vector)) } > flash - .text : { *(.text* .text.*) } > flash - .rodata : { *(.rodata*) } > flash - - .data : { - _sdata = .; /* for init_ram() */ - *(.first_data) - *(.data SORT(.data.*)) - _edata = .; /* for init_ram() */ - } > sram AT > flash - _sidata = LOADADDR(.data); - - .bss : { - _sbss = .; /* for init_ram() */ - *(.bss SORT(.bss.*) COMMON) - _ebss = .; /* for init_ram() */ - } > sram - - . = ALIGN(8); - _end = .; /* for cmsis_gcc.h and init_ram() */ -} diff --git a/examples/stm32/nucleo-f429zi-make-baremetal-builtin/main.c b/examples/stm32/nucleo-f429zi-make-baremetal-builtin/main.c deleted file mode 100644 index 0dca9f1c1f..0000000000 --- a/examples/stm32/nucleo-f429zi-make-baremetal-builtin/main.c +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright (c) 2022-2023 Cesanta Software Limited -// All rights reserved - -#include "hal.h" -#include "mongoose.h" -#include "net.h" - -#define BLINK_PERIOD_MS 1000 // LED blinking period in millis - -static volatile uint64_t s_ticks; // Milliseconds since boot -void SysTick_Handler(void) { // SyStick IRQ handler, triggered every 1ms - s_ticks++; -} - -uint64_t mg_millis(void) { // Let Mongoose use our uptime function - return s_ticks; // Return number of milliseconds since boot -} - -bool mg_random(void *buf, size_t len) { // Use on-board RNG - for (size_t n = 0; n < len; n += sizeof(uint32_t)) { - uint32_t r = rng_read(); - memcpy((char *) buf + n, &r, n + sizeof(r) > len ? len - n : sizeof(r)); - } - return true; -} - -static void timer_fn(void *arg) { - gpio_toggle(LED); // Blink LED - struct mg_tcpip_if *ifp = arg; // And show - const char *names[] = {"down", "up", "req", "ready"}; // network stats - MG_INFO(("Ethernet: %s, IP: %M, rx:%u, tx:%u, dr:%u, er:%u", - names[ifp->state], mg_print_ip4, &ifp->ip, ifp->nrecv, ifp->nsent, - ifp->ndrop, ifp->nerr)); -} - -int main(void) { - gpio_output(LED); // Setup blue LED - uart_init(UART_DEBUG, 115200); // Initialise debug printf - ethernet_init(); // Initialise ethernet pins - MG_INFO(("Starting, CPU freq %g MHz", (double) SystemCoreClock / 1000000)); - - struct mg_mgr mgr; // Initialise - mg_mgr_init(&mgr); // Mongoose event manager - mg_log_set(MG_LL_DEBUG); // Set log level - - // Initialise Mongoose network stack - struct mg_tcpip_driver_stm32f_data driver_data = {.mdc_cr = 4}; - struct mg_tcpip_if mif = {.mac = GENERATE_LOCALLY_ADMINISTERED_MAC(), - // Uncomment below for static configuration: - // .ip = mg_htonl(MG_U32(192, 168, 0, 223)), - // .mask = mg_htonl(MG_U32(255, 255, 255, 0)), - // .gw = mg_htonl(MG_U32(192, 168, 0, 1)), - .driver = &mg_tcpip_driver_stm32f, - .driver_data = &driver_data}; - mg_tcpip_init(&mgr, &mif); - mg_timer_add(&mgr, BLINK_PERIOD_MS, MG_TIMER_REPEAT, timer_fn, &mif); - - MG_INFO(("MAC: %M. Waiting for IP...", mg_print_mac, mif.mac)); - while (mif.state != MG_TCPIP_STATE_READY) { - mg_mgr_poll(&mgr, 0); - } - - MG_INFO(("Initialising application...")); - web_init(&mgr); - - MG_INFO(("Starting event loop")); - for (;;) { - mg_mgr_poll(&mgr, 0); - } - - return 0; -} diff --git a/examples/stm32/nucleo-f429zi-make-baremetal-builtin/mongoose.c b/examples/stm32/nucleo-f429zi-make-baremetal-builtin/mongoose.c deleted file mode 120000 index 5e522bbcd4..0000000000 --- a/examples/stm32/nucleo-f429zi-make-baremetal-builtin/mongoose.c +++ /dev/null @@ -1 +0,0 @@ -../../../mongoose.c \ No newline at end of file diff --git a/examples/stm32/nucleo-f429zi-make-baremetal-builtin/mongoose.h b/examples/stm32/nucleo-f429zi-make-baremetal-builtin/mongoose.h deleted file mode 120000 index ee4ac82323..0000000000 --- a/examples/stm32/nucleo-f429zi-make-baremetal-builtin/mongoose.h +++ /dev/null @@ -1 +0,0 @@ -../../../mongoose.h \ No newline at end of file diff --git a/examples/stm32/nucleo-f429zi-make-baremetal-builtin/mongoose_config.h b/examples/stm32/nucleo-f429zi-make-baremetal-builtin/mongoose_config.h deleted file mode 100644 index 4ce3a48f4d..0000000000 --- a/examples/stm32/nucleo-f429zi-make-baremetal-builtin/mongoose_config.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -// See https://mongoose.ws/documentation/#build-options -#define MG_ARCH MG_ARCH_NEWLIB - -#define MG_ENABLE_TCPIP 1 -#define MG_ENABLE_CUSTOM_MILLIS 1 -#define MG_ENABLE_CUSTOM_RANDOM 1 -#define MG_ENABLE_PACKED_FS 1 -#define MG_ENABLE_DRIVER_STM32F 1 -#define MG_ENABLE_LINES 1 diff --git a/examples/stm32/nucleo-f429zi-make-baremetal-builtin/net.c b/examples/stm32/nucleo-f429zi-make-baremetal-builtin/net.c deleted file mode 120000 index fe0e6f06e7..0000000000 --- a/examples/stm32/nucleo-f429zi-make-baremetal-builtin/net.c +++ /dev/null @@ -1 +0,0 @@ -../../device-dashboard/net.c \ No newline at end of file diff --git a/examples/stm32/nucleo-f429zi-make-baremetal-builtin/net.h b/examples/stm32/nucleo-f429zi-make-baremetal-builtin/net.h deleted file mode 120000 index 9de896ef4e..0000000000 --- a/examples/stm32/nucleo-f429zi-make-baremetal-builtin/net.h +++ /dev/null @@ -1 +0,0 @@ -../../device-dashboard/net.h \ No newline at end of file diff --git a/examples/stm32/nucleo-f429zi-make-baremetal-builtin/packed_fs.c b/examples/stm32/nucleo-f429zi-make-baremetal-builtin/packed_fs.c deleted file mode 120000 index e06bf09258..0000000000 --- a/examples/stm32/nucleo-f429zi-make-baremetal-builtin/packed_fs.c +++ /dev/null @@ -1 +0,0 @@ -../../device-dashboard/packed_fs.c \ No newline at end of file diff --git a/examples/stm32/nucleo-f429zi-make-baremetal-builtin/syscalls.c b/examples/stm32/nucleo-f429zi-make-baremetal-builtin/syscalls.c deleted file mode 100644 index ac27f09373..0000000000 --- a/examples/stm32/nucleo-f429zi-make-baremetal-builtin/syscalls.c +++ /dev/null @@ -1,88 +0,0 @@ -#include - -#include "hal.h" - -int _fstat(int fd, struct stat *st) { - if (fd < 0) return -1; - st->st_mode = S_IFCHR; - return 0; -} - -void *_sbrk(int incr) { - extern char _end; - static unsigned char *heap = NULL; - unsigned char *prev_heap; - unsigned char x = 0, *heap_end = (unsigned char *)((size_t) &x - 512); - (void) x; - if (heap == NULL) heap = (unsigned char *) &_end; - prev_heap = heap; - if (heap + incr > heap_end) return (void *) -1; - heap += incr; - return prev_heap; -} - -int _open(const char *path) { - (void) path; - return -1; -} - -int _close(int fd) { - (void) fd; - return -1; -} - -int _isatty(int fd) { - (void) fd; - return 1; -} - -int _lseek(int fd, int ptr, int dir) { - (void) fd, (void) ptr, (void) dir; - return 0; -} - -void _exit(int status) { - (void) status; - for (;;) asm volatile("BKPT #0"); -} - -void _kill(int pid, int sig) { - (void) pid, (void) sig; -} - -int _getpid(void) { - return -1; -} - -int _write(int fd, char *ptr, int len) { - (void) fd, (void) ptr, (void) len; - if (fd == 1) uart_write_buf(UART_DEBUG, ptr, (size_t) len); - return -1; -} - -int _read(int fd, char *ptr, int len) { - (void) fd, (void) ptr, (void) len; - return -1; -} - -int _link(const char *a, const char *b) { - (void) a, (void) b; - return -1; -} - -int _unlink(const char *a) { - (void) a; - return -1; -} - -int _stat(const char *path, struct stat *st) { - (void) path, (void) st; - return -1; -} - -int mkdir(const char *path, mode_t mode) { - (void) path, (void) mode; - return -1; -} - -void _init(void) {} diff --git a/examples/stm32/nucleo-f429zi-make-baremetal-builtin/sysinit.c b/examples/stm32/nucleo-f429zi-make-baremetal-builtin/sysinit.c deleted file mode 100644 index 5e65284e15..0000000000 --- a/examples/stm32/nucleo-f429zi-make-baremetal-builtin/sysinit.c +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) 2023 Cesanta Software Limited -// All rights reserved -// -// This file contains essentials required by the CMSIS: -// uint32_t SystemCoreClock - holds the system core clock value -// SystemInit() - initialises the system, e.g. sets up clocks - -#include "hal.h" - -uint32_t SystemCoreClock = SYS_FREQUENCY; - -void SystemInit(void) { // Called automatically by startup code - SCB->CPACR |= ((3UL << 10 * 2) | (3UL << 11 * 2)); // Enable FPU - asm("DSB"); - asm("ISB"); - FLASH->ACR |= FLASH_LATENCY | BIT(8) | BIT(9); // Flash latency, prefetch - RCC->PLLCFGR &= ~((BIT(17) - 1)); // Clear PLL multipliers - RCC->PLLCFGR |= (((PLL_P - 2) / 2) & 3) << 16; // Set PLL_P - RCC->PLLCFGR |= PLL_M | (PLL_N << 6); // Set PLL_M and PLL_N - RCC->CR |= BIT(24); // Enable PLL - while ((RCC->CR & BIT(25)) == 0) spin(1); // Wait until done - RCC->CFGR = (APB1_PRE << 10) | (APB2_PRE << 13); // Set prescalers - RCC->CFGR |= 2; // Set clock source to PLL - while ((RCC->CFGR & 12) == 0) spin(1); // Wait until done - - RCC->APB2ENR |= RCC_APB2ENR_SYSCFGEN; // Enable SYSCFG - rng_init(); // Initialise random number generator - SysTick_Config(SystemCoreClock / 1000); // Sys tick every 1ms -} From ea509c0a3601ee14422fc8f46a546ae6abf6d335 Mon Sep 17 00:00:00 2001 From: "Sergio R. Caprile" Date: Thu, 5 Sep 2024 11:48:20 -0300 Subject: [PATCH 2/2] move to Wizard --- .../FreeRTOSConfig.h | 37 ---- .../Makefile | 56 ++---- .../README.md | 4 +- .../nucleo-f429zi-make-freertos-builtin/hal.h | 164 ------------------ .../link.ld | 29 ---- .../main.c | 76 -------- .../mongoose.c | 1 - .../mongoose.h | 1 - .../mongoose_config.h | 11 -- .../nucleo-f429zi-make-freertos-builtin/net.c | 1 - .../nucleo-f429zi-make-freertos-builtin/net.h | 1 - .../packed_fs.c | 1 - .../syscalls.c | 85 --------- .../sysinit.c | 29 ---- 14 files changed, 14 insertions(+), 482 deletions(-) delete mode 100644 examples/stm32/nucleo-f429zi-make-freertos-builtin/FreeRTOSConfig.h delete mode 100644 examples/stm32/nucleo-f429zi-make-freertos-builtin/hal.h delete mode 100644 examples/stm32/nucleo-f429zi-make-freertos-builtin/link.ld delete mode 100644 examples/stm32/nucleo-f429zi-make-freertos-builtin/main.c delete mode 120000 examples/stm32/nucleo-f429zi-make-freertos-builtin/mongoose.c delete mode 120000 examples/stm32/nucleo-f429zi-make-freertos-builtin/mongoose.h delete mode 100644 examples/stm32/nucleo-f429zi-make-freertos-builtin/mongoose_config.h delete mode 120000 examples/stm32/nucleo-f429zi-make-freertos-builtin/net.c delete mode 120000 examples/stm32/nucleo-f429zi-make-freertos-builtin/net.h delete mode 120000 examples/stm32/nucleo-f429zi-make-freertos-builtin/packed_fs.c delete mode 100644 examples/stm32/nucleo-f429zi-make-freertos-builtin/syscalls.c delete mode 100644 examples/stm32/nucleo-f429zi-make-freertos-builtin/sysinit.c diff --git a/examples/stm32/nucleo-f429zi-make-freertos-builtin/FreeRTOSConfig.h b/examples/stm32/nucleo-f429zi-make-freertos-builtin/FreeRTOSConfig.h deleted file mode 100644 index 8ae184bbb1..0000000000 --- a/examples/stm32/nucleo-f429zi-make-freertos-builtin/FreeRTOSConfig.h +++ /dev/null @@ -1,37 +0,0 @@ -#pragma once - -#include "hal.h" - -#define configUSE_PREEMPTION 1 -#define configCPU_CLOCK_HZ SYS_FREQUENCY -#define configTICK_RATE_HZ 1000 -#define configMAX_PRIORITIES 5 -#define configUSE_16_BIT_TICKS 0 -#define configUSE_TICK_HOOK 0 -#define configUSE_IDLE_HOOK 0 -#define configUSE_TIMERS 0 -#define configUSE_CO_ROUTINES 0 -#define configUSE_MALLOC_FAILED_HOOK 0 -#define configMINIMAL_STACK_SIZE 128 -#define configTOTAL_HEAP_SIZE (1024 * 128) -#define INCLUDE_vTaskDelay 1 - -#ifdef __NVIC_PRIO_BITS -#define configPRIO_BITS __NVIC_PRIO_BITS -#else -#define configPRIO_BITS 4 -#endif -#define configLIBRARY_LOWEST_INTERRUPT_PRIORITY 15 -#define configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY 5 -#define configKERNEL_INTERRUPT_PRIORITY \ - (configLIBRARY_LOWEST_INTERRUPT_PRIORITY << (8 - configPRIO_BITS)) - -#define configMAX_SYSCALL_INTERRUPT_PRIORITY \ - (configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY << (8 - configPRIO_BITS)) - -#define configASSERT(expr) \ - if (!(expr)) printf("FAILURE %s:%d: %s\n", __FILE__, __LINE__, #expr) - -#define vPortSVCHandler SVC_Handler -#define xPortPendSVHandler PendSV_Handler -#define xPortSysTickHandler SysTick_Handler diff --git a/examples/stm32/nucleo-f429zi-make-freertos-builtin/Makefile b/examples/stm32/nucleo-f429zi-make-freertos-builtin/Makefile index f734447e85..bb1b043c72 100644 --- a/examples/stm32/nucleo-f429zi-make-freertos-builtin/Makefile +++ b/examples/stm32/nucleo-f429zi-make-freertos-builtin/Makefile @@ -1,59 +1,29 @@ -CFLAGS = -W -Wall -Wextra -Werror -Wundef -Wshadow -Wdouble-promotion -CFLAGS += -Wformat-truncation -fno-common -Wconversion -Wno-sign-conversion -CFLAGS += -g3 -Os -ffunction-sections -fdata-sections -CFLAGS += -I. -Icmsis_core/CMSIS/Core/Include -Icmsis_f4/Include -CFLAGS += -mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 $(CFLAGS_EXTRA) -LDFLAGS ?= -Tlink.ld -nostdlib -nostartfiles --specs nano.specs -lc -lgcc -Wl,--gc-sections -Wl,-Map=$@.map - -SOURCES = main.c syscalls.c sysinit.c -SOURCES += cmsis_f4/Source/Templates/gcc/startup_stm32f429xx.s # ST startup file. Compiler-dependent! - -# FreeRTOS -SOURCES += FreeRTOS-Kernel/portable/MemMang/heap_4.c -SOURCES += FreeRTOS-Kernel/portable/GCC/ARM_CM4F/port.c -CFLAGS += -IFreeRTOS-Kernel/include -CFLAGS += -IFreeRTOS-Kernel/portable/GCC/ARM_CM4F -Wno-conversion - -# Mongoose options are defined in mongoose_config.h -SOURCES += mongoose.c net.c packed_fs.c - -# Example specific build options. See README.md -CFLAGS += -DHTTP_URL=\"http://0.0.0.0/\" - -ifeq ($(OS),Windows_NT) - RM = cmd /C del /Q /F /S -else - RM = rm -rf -endif +BOARD = f429 +IDE = GCC+make +RTOS = FreeRTOS +WIZARD_URL ?= http://mongoose.ws/wizard all build example: firmware.bin -firmware.bin: firmware.elf - arm-none-eabi-objcopy -O binary $< $@ - -firmware.elf: FreeRTOS-Kernel cmsis_core cmsis_f4 $(SOURCES) hal.h link.ld - arm-none-eabi-gcc $(SOURCES) $(wildcard FreeRTOS-Kernel/*.c) $(CFLAGS) $(LDFLAGS) -o $@ +firmware.bin: wizard + make -C wizard CFLAGS_EXTRA=$(CFLAGS_EXTRA) && mv wizard/firmware.bin ./ -flash: firmware.bin - st-flash --reset write $< 0x8000000 +wizard: + hash=$$(curl -s -X POST -H "Content-Type: application/json" -d '{"build":{"board":"$(BOARD)","ide":"$(IDE)","rtos":"$(RTOS)"}}' $(WIZARD_URL)/api/hash | jq -r '.hash') \ + && curl -s $(WIZARD_URL)/api/zip/$(BOARD)/$(IDE)/$(RTOS)/$$hash -o wizard.zip + unzip wizard.zip + cd wizard ; rm mongoose.[ch] ; ln -s ../../../../mongoose.c ; ln -s ../../../../mongoose.h -cmsis_core: # ARM CMSIS core headers - git clone --depth 1 -b 5.9.0 https://github.com/ARM-software/CMSIS_5 $@ -cmsis_f4: # ST CMSIS headers for STM32F4 series - git clone --depth 1 -b v2.6.8 https://github.com/STMicroelectronics/cmsis_device_f4 $@ -FreeRTOS-Kernel: # FreeRTOS sources - git clone --depth 1 -b V10.5.0 https://github.com/FreeRTOS/FreeRTOS-Kernel $@ # Automated remote test. Requires env variable VCON_API_KEY set. See https://vcon.io/automated-firmware-tests/ DEVICE_URL ?= https://dash.vcon.io/api/v3/devices/2 update: firmware.bin curl --fail-with-body -su :$(VCON_API_KEY) $(DEVICE_URL)/ota --data-binary @$< -test update: CFLAGS += -DUART_DEBUG=USART1 +test update: CFLAGS_EXTRA ="-DUART_DEBUG=USART1" test: update curl --fail-with-body -su :$(VCON_API_KEY) $(DEVICE_URL)/tx?t=5 | tee /tmp/output.txt grep 'READY, IP:' /tmp/output.txt # Check for network init -# grep 'MQTT connected' /tmp/output.txt # Check for MQTT connection success clean: - $(RM) firmware.* *.su cmsis_core cmsis_f4 FreeRTOS-Kernel + rm -rf firmware.* wizard* diff --git a/examples/stm32/nucleo-f429zi-make-freertos-builtin/README.md b/examples/stm32/nucleo-f429zi-make-freertos-builtin/README.md index 066578a021..e865ab0ecd 100644 --- a/examples/stm32/nucleo-f429zi-make-freertos-builtin/README.md +++ b/examples/stm32/nucleo-f429zi-make-freertos-builtin/README.md @@ -1,3 +1 @@ -# FreeRTOS Web device dashboard on NUCLEO-F429ZI - -See https://mongoose.ws/tutorials/stm32/all-make-freertos-builtin/ +See [Wizard](https://mongoose.ws/wizard/#/output?board=f429&ide=GCC+make&rtos=FreeRTOS&file=README.md) diff --git a/examples/stm32/nucleo-f429zi-make-freertos-builtin/hal.h b/examples/stm32/nucleo-f429zi-make-freertos-builtin/hal.h deleted file mode 100644 index cffabf4db3..0000000000 --- a/examples/stm32/nucleo-f429zi-make-freertos-builtin/hal.h +++ /dev/null @@ -1,164 +0,0 @@ -// Copyright (c) 2022 Cesanta Software Limited -// All rights reserved -// https://www.st.com/resource/en/reference_manual/dm00031020-stm32f405-415-stm32f407-417-stm32f427-437-and-stm32f429-439-advanced-arm-based-32-bit-mcus-stmicroelectronics.pdf -// https://www.st.com/resource/en/datasheet/stm32f429zi.pdf - -#pragma once - -#include - -#include -#include -#include -#include - - -#define BIT(x) (1UL << (x)) -#define SETBITS(R, CLEARMASK, SETMASK) (R) = ((R) & ~(CLEARMASK)) | (SETMASK) -#define PIN(bank, num) ((((bank) - 'A') << 8) | (num)) -#define PINNO(pin) (pin & 255) -#define PINBANK(pin) (pin >> 8) - -#define LED1 PIN('B', 0) // On-board LED pin (green) -#define LED2 PIN('B', 7) // On-board LED pin (blue) -#define LED3 PIN('B', 14) // On-board LED pin (red) - -#define LED LED2 // Use blue LED for blinking - -// 6.3.3: APB1 clock <= 45MHz; APB2 clock <= 90MHz -// 3.5.1, Table 11: configure flash latency (WS) in accordance to clock freq -// 33.4: The AHB clock must be at least 25 MHz when Ethernet is used -enum { APB1_PRE = 5 /* AHB clock / 4 */, APB2_PRE = 4 /* AHB clock / 2 */ }; -enum { PLL_HSI = 16, PLL_M = 8, PLL_N = 180, PLL_P = 2 }; // Run at 180 Mhz -#define FLASH_LATENCY 5 -#define SYS_FREQUENCY ((PLL_HSI * PLL_N / PLL_M / PLL_P) * 1000000) -#define APB2_FREQUENCY (SYS_FREQUENCY / (BIT(APB2_PRE - 3))) -#define APB1_FREQUENCY (SYS_FREQUENCY / (BIT(APB1_PRE - 3))) - -static inline void spin(volatile uint32_t count) { - while (count--) (void) 0; -} - -enum { GPIO_MODE_INPUT, GPIO_MODE_OUTPUT, GPIO_MODE_AF, GPIO_MODE_ANALOG }; -enum { GPIO_OTYPE_PUSH_PULL, GPIO_OTYPE_OPEN_DRAIN }; -enum { GPIO_SPEED_LOW, GPIO_SPEED_MEDIUM, GPIO_SPEED_HIGH, GPIO_SPEED_INSANE }; -enum { GPIO_PULL_NONE, GPIO_PULL_UP, GPIO_PULL_DOWN }; -#define GPIO(N) ((GPIO_TypeDef *) (0x40020000 + 0x400 * (N))) - -static GPIO_TypeDef *gpio_bank(uint16_t pin) { return GPIO(PINBANK(pin)); } -static inline void gpio_toggle(uint16_t pin) { - GPIO_TypeDef *gpio = gpio_bank(pin); - uint32_t mask = BIT(PINNO(pin)); - gpio->BSRR = mask << (gpio->ODR & mask ? 16 : 0); -} -static inline int gpio_read(uint16_t pin) { - return gpio_bank(pin)->IDR & BIT(PINNO(pin)) ? 1 : 0; -} -static inline void gpio_write(uint16_t pin, bool val) { - GPIO_TypeDef *gpio = gpio_bank(pin); - gpio->BSRR = BIT(PINNO(pin)) << (val ? 0 : 16); -} -static inline void gpio_init(uint16_t pin, uint8_t mode, uint8_t type, - uint8_t speed, uint8_t pull, uint8_t af) { - GPIO_TypeDef *gpio = gpio_bank(pin); - uint8_t n = (uint8_t) (PINNO(pin)); - RCC->AHB1ENR |= BIT(PINBANK(pin)); // Enable GPIO clock - SETBITS(gpio->OTYPER, 1UL << n, ((uint32_t) type) << n); - SETBITS(gpio->OSPEEDR, 3UL << (n * 2), ((uint32_t) speed) << (n * 2)); - SETBITS(gpio->PUPDR, 3UL << (n * 2), ((uint32_t) pull) << (n * 2)); - SETBITS(gpio->AFR[n >> 3], 15UL << ((n & 7) * 4), - ((uint32_t) af) << ((n & 7) * 4)); - SETBITS(gpio->MODER, 3UL << (n * 2), ((uint32_t) mode) << (n * 2)); -} -static inline void gpio_input(uint16_t pin) { - gpio_init(pin, GPIO_MODE_INPUT, GPIO_OTYPE_PUSH_PULL, GPIO_SPEED_HIGH, - GPIO_PULL_NONE, 0); -} -static inline void gpio_output(uint16_t pin) { - gpio_init(pin, GPIO_MODE_OUTPUT, GPIO_OTYPE_PUSH_PULL, GPIO_SPEED_HIGH, - GPIO_PULL_NONE, 0); -} - -static inline void irq_exti_attach(uint16_t pin) { - uint8_t bank = (uint8_t) (PINBANK(pin)), n = (uint8_t) (PINNO(pin)); - SYSCFG->EXTICR[n / 4] &= ~(15UL << ((n % 4) * 4)); - SYSCFG->EXTICR[n / 4] |= (uint32_t) (bank << ((n % 4) * 4)); - EXTI->IMR |= BIT(n); - EXTI->RTSR |= BIT(n); - EXTI->FTSR |= BIT(n); - int irqvec = n < 5 ? 6 + n : n < 10 ? 23 : 40; // IRQ vector index, 10.1.2 - NVIC_SetPriority(irqvec, 3); - NVIC_EnableIRQ(irqvec); -} - -#ifndef UART_DEBUG -#define UART_DEBUG USART3 -#endif - -static inline void uart_init(USART_TypeDef *uart, unsigned long baud) { - uint8_t af = 7; // Alternate function - uint16_t rx = 0, tx = 0; // pins - uint32_t freq = 0; // Bus frequency. UART1 is on APB2, rest on APB1 - - if (uart == USART1) freq = APB2_FREQUENCY, RCC->APB2ENR |= BIT(4); - if (uart == USART2) freq = APB1_FREQUENCY, RCC->APB1ENR |= BIT(17); - if (uart == USART3) freq = APB1_FREQUENCY, RCC->APB1ENR |= BIT(18); - - if (uart == USART1) tx = PIN('A', 9), rx = PIN('A', 10); - if (uart == USART2) tx = PIN('A', 2), rx = PIN('A', 3); - if (uart == USART3) tx = PIN('D', 8), rx = PIN('D', 9); - - gpio_init(tx, GPIO_MODE_AF, GPIO_OTYPE_PUSH_PULL, GPIO_SPEED_HIGH, 0, af); - gpio_init(rx, GPIO_MODE_AF, GPIO_OTYPE_PUSH_PULL, GPIO_SPEED_HIGH, 0, af); - uart->CR1 = 0; // Disable this UART - uart->BRR = freq / baud; // Set baud rate - uart->CR1 |= BIT(13) | BIT(2) | BIT(3); // Set UE, RE, TE -} -static inline void uart_write_byte(USART_TypeDef *uart, uint8_t byte) { - uart->DR = byte; - while ((uart->SR & BIT(7)) == 0) spin(1); -} -static inline void uart_write_buf(USART_TypeDef *uart, char *buf, size_t len) { - while (len-- > 0) uart_write_byte(uart, *(uint8_t *) buf++); -} -static inline int uart_read_ready(USART_TypeDef *uart) { - return uart->SR & BIT(5); // If RXNE bit is set, data is ready -} -static inline uint8_t uart_read_byte(USART_TypeDef *uart) { - return (uint8_t) (uart->DR & 255); -} - -static inline void rng_init(void) { - RCC->AHB2ENR |= RCC_AHB2ENR_RNGEN; - RNG->CR |= RNG_CR_RNGEN; -} -static inline uint32_t rng_read(void) { - while ((RNG->SR & RNG_SR_DRDY) == 0) (void) 0; - return RNG->DR; -} - -// Hw pull-ups on PHY RXD0,1,DV to enable autonegotiation -static inline void ethernet_init(void) { - // Initialise Ethernet. Enable MAC GPIO pins, see - // https://www.farnell.com/datasheets/2014265.pdf section 6.10 - uint16_t pins[] = {PIN('A', 1), PIN('A', 2), PIN('A', 7), - PIN('B', 13), PIN('C', 1), PIN('C', 4), - PIN('C', 5), PIN('G', 11), PIN('G', 13)}; - for (size_t i = 0; i < sizeof(pins) / sizeof(pins[0]); i++) { - gpio_init(pins[i], GPIO_MODE_AF, GPIO_OTYPE_PUSH_PULL, GPIO_SPEED_INSANE, - GPIO_PULL_NONE, 11); // 11 is the Ethernet function - } - NVIC_EnableIRQ(ETH_IRQn); // Setup Ethernet IRQ handler - SYSCFG->PMC |= SYSCFG_PMC_MII_RMII_SEL; // Use RMII. Goes first! - RCC->AHB1ENR |= - RCC_AHB1ENR_ETHMACEN | RCC_AHB1ENR_ETHMACTXEN | RCC_AHB1ENR_ETHMACRXEN; -} - -#define UUID ((uint8_t *) UID_BASE) // Unique 96-bit chip ID. TRM 39.1 - -// Helper macro for MAC generation -#define GENERATE_LOCALLY_ADMINISTERED_MAC() \ - { \ - 2, UUID[0] ^ UUID[1], UUID[2] ^ UUID[3], UUID[4] ^ UUID[5], \ - UUID[6] ^ UUID[7] ^ UUID[8], UUID[9] ^ UUID[10] ^ UUID[11] \ - } diff --git a/examples/stm32/nucleo-f429zi-make-freertos-builtin/link.ld b/examples/stm32/nucleo-f429zi-make-freertos-builtin/link.ld deleted file mode 100644 index b973269bc0..0000000000 --- a/examples/stm32/nucleo-f429zi-make-freertos-builtin/link.ld +++ /dev/null @@ -1,29 +0,0 @@ -ENTRY(Reset_Handler); -MEMORY { - flash(rx) : ORIGIN = 0x08000000, LENGTH = 2048k - sram(rwx) : ORIGIN = 0x20000000, LENGTH = 192k /* remaining 64k in a separate address space */ -} -_estack = ORIGIN(sram) + LENGTH(sram); /* stack points to end of SRAM */ - -SECTIONS { - .vectors : { KEEP(*(.isr_vector)) } > flash - .text : { *(.text* .text.*) } > flash - .rodata : { *(.rodata*) } > flash - - .data : { - _sdata = .; /* for init_ram() */ - *(.first_data) - *(.data SORT(.data.*)) - _edata = .; /* for init_ram() */ - } > sram AT > flash - _sidata = LOADADDR(.data); - - .bss : { - _sbss = .; /* for init_ram() */ - *(.bss SORT(.bss.*) COMMON) - _ebss = .; /* for init_ram() */ - } > sram - - . = ALIGN(8); - _end = .; /* for cmsis_gcc.h and init_ram() */ -} diff --git a/examples/stm32/nucleo-f429zi-make-freertos-builtin/main.c b/examples/stm32/nucleo-f429zi-make-freertos-builtin/main.c deleted file mode 100644 index 58382cbaca..0000000000 --- a/examples/stm32/nucleo-f429zi-make-freertos-builtin/main.c +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright (c) 2022-2023 Cesanta Software Limited -// All rights reserved - -#include "hal.h" -#include "mongoose.h" -#include "net.h" - -#define BLINK_PERIOD_MS 1000 // LED blinking period in millis - -bool mg_random(void *buf, size_t len) { // Use on-board RNG - for (size_t n = 0; n < len; n += sizeof(uint32_t)) { - uint32_t r = rng_read(); - memcpy((char *) buf + n, &r, n + sizeof(r) > len ? len - n : sizeof(r)); - } - return true; -} - -static void timer_fn(void *arg) { - struct mg_tcpip_if *ifp = arg; // And show - const char *names[] = {"down", "up", "req", "ready"}; // network stats - MG_INFO(("Ethernet: %s, IP: %M, rx:%u, tx:%u, dr:%u, er:%u", - names[ifp->state], mg_print_ip4, &ifp->ip, ifp->nrecv, ifp->nsent, - ifp->ndrop, ifp->nerr)); -} - -static void server(void *args) { - struct mg_mgr mgr; // Initialise Mongoose event manager - mg_mgr_init(&mgr); // and attach it to the interface - mg_log_set(MG_LL_DEBUG); // Set log level - - // Initialise Mongoose network stack - ethernet_init(); - struct mg_tcpip_driver_stm32f_data driver_data = {.mdc_cr = 4}; - struct mg_tcpip_if mif = {.mac = GENERATE_LOCALLY_ADMINISTERED_MAC(), - // Uncomment below for static configuration: - // .ip = mg_htonl(MG_U32(192, 168, 0, 223)), - // .mask = mg_htonl(MG_U32(255, 255, 255, 0)), - // .gw = mg_htonl(MG_U32(192, 168, 0, 1)), - .driver = &mg_tcpip_driver_stm32f, - .driver_data = &driver_data}; - mg_tcpip_init(&mgr, &mif); - mg_timer_add(&mgr, BLINK_PERIOD_MS, MG_TIMER_REPEAT, timer_fn, &mif); - - MG_INFO(("MAC: %M. Waiting for IP...", mg_print_mac, mif.mac)); - while (mif.state != MG_TCPIP_STATE_READY) { - mg_mgr_poll(&mgr, 0); - } - - MG_INFO(("Initialising application...")); - web_init(&mgr); - - MG_INFO(("Starting event loop")); - for (;;) mg_mgr_poll(&mgr, 1); // Infinite event loop - (void) args; -} - -static void blinker(void *args) { - gpio_init(LED, GPIO_MODE_OUTPUT, GPIO_OTYPE_PUSH_PULL, GPIO_SPEED_MEDIUM, - GPIO_PULL_NONE, 0); - for (;;) { - gpio_toggle(LED); - vTaskDelay(pdMS_TO_TICKS(BLINK_PERIOD_MS)); - } - (void) args; -} - -int main(void) { - uart_init(UART_DEBUG, 115200); // Initialise UART - - // Start tasks. NOTE: stack sizes are in 32-bit words - xTaskCreate(blinker, "blinker", 128, ":)", configMAX_PRIORITIES - 1, NULL); - xTaskCreate(server, "server", 2048, 0, configMAX_PRIORITIES - 1, NULL); - - vTaskStartScheduler(); // This blocks - return 0; -} diff --git a/examples/stm32/nucleo-f429zi-make-freertos-builtin/mongoose.c b/examples/stm32/nucleo-f429zi-make-freertos-builtin/mongoose.c deleted file mode 120000 index 5e522bbcd4..0000000000 --- a/examples/stm32/nucleo-f429zi-make-freertos-builtin/mongoose.c +++ /dev/null @@ -1 +0,0 @@ -../../../mongoose.c \ No newline at end of file diff --git a/examples/stm32/nucleo-f429zi-make-freertos-builtin/mongoose.h b/examples/stm32/nucleo-f429zi-make-freertos-builtin/mongoose.h deleted file mode 120000 index ee4ac82323..0000000000 --- a/examples/stm32/nucleo-f429zi-make-freertos-builtin/mongoose.h +++ /dev/null @@ -1 +0,0 @@ -../../../mongoose.h \ No newline at end of file diff --git a/examples/stm32/nucleo-f429zi-make-freertos-builtin/mongoose_config.h b/examples/stm32/nucleo-f429zi-make-freertos-builtin/mongoose_config.h deleted file mode 100644 index 89f25b7638..0000000000 --- a/examples/stm32/nucleo-f429zi-make-freertos-builtin/mongoose_config.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -// See https://mongoose.ws/documentation/#build-options -#define MG_ARCH MG_ARCH_FREERTOS - -#define MG_ENABLE_TCPIP 1 -#define MG_ENABLE_DRIVER_STM32F 1 -#define MG_IO_SIZE 256 -#define MG_ENABLE_CUSTOM_RANDOM 1 -#define MG_ENABLE_PACKED_FS 1 - diff --git a/examples/stm32/nucleo-f429zi-make-freertos-builtin/net.c b/examples/stm32/nucleo-f429zi-make-freertos-builtin/net.c deleted file mode 120000 index fe0e6f06e7..0000000000 --- a/examples/stm32/nucleo-f429zi-make-freertos-builtin/net.c +++ /dev/null @@ -1 +0,0 @@ -../../device-dashboard/net.c \ No newline at end of file diff --git a/examples/stm32/nucleo-f429zi-make-freertos-builtin/net.h b/examples/stm32/nucleo-f429zi-make-freertos-builtin/net.h deleted file mode 120000 index 9de896ef4e..0000000000 --- a/examples/stm32/nucleo-f429zi-make-freertos-builtin/net.h +++ /dev/null @@ -1 +0,0 @@ -../../device-dashboard/net.h \ No newline at end of file diff --git a/examples/stm32/nucleo-f429zi-make-freertos-builtin/packed_fs.c b/examples/stm32/nucleo-f429zi-make-freertos-builtin/packed_fs.c deleted file mode 120000 index e06bf09258..0000000000 --- a/examples/stm32/nucleo-f429zi-make-freertos-builtin/packed_fs.c +++ /dev/null @@ -1 +0,0 @@ -../../device-dashboard/packed_fs.c \ No newline at end of file diff --git a/examples/stm32/nucleo-f429zi-make-freertos-builtin/syscalls.c b/examples/stm32/nucleo-f429zi-make-freertos-builtin/syscalls.c deleted file mode 100644 index be3210aabb..0000000000 --- a/examples/stm32/nucleo-f429zi-make-freertos-builtin/syscalls.c +++ /dev/null @@ -1,85 +0,0 @@ -#include - -#include "hal.h" - -int _fstat(int fd, struct stat *st) { - if (fd < 0) return -1; - st->st_mode = S_IFCHR; - return 0; -} - -void *_sbrk(int incr) { - extern char _end; - static unsigned char *heap = NULL; - unsigned char *prev_heap; - if (heap == NULL) heap = (unsigned char *) &_end; - prev_heap = heap; - heap += incr; - return prev_heap; -} - -int _open(const char *path) { - (void) path; - return -1; -} - -int _close(int fd) { - (void) fd; - return -1; -} - -int _isatty(int fd) { - (void) fd; - return 1; -} - -int _lseek(int fd, int ptr, int dir) { - (void) fd, (void) ptr, (void) dir; - return 0; -} - -void _exit(int status) { - (void) status; - for (;;) asm volatile("BKPT #0"); -} - -void _kill(int pid, int sig) { - (void) pid, (void) sig; -} - -int _getpid(void) { - return -1; -} - -int _write(int fd, char *ptr, int len) { - (void) fd, (void) ptr, (void) len; - if (fd == 1) uart_write_buf(UART_DEBUG, ptr, (size_t) len); - return -1; -} - -int _read(int fd, char *ptr, int len) { - (void) fd, (void) ptr, (void) len; - return -1; -} - -int _link(const char *a, const char *b) { - (void) a, (void) b; - return -1; -} - -int _unlink(const char *a) { - (void) a; - return -1; -} - -int _stat(const char *path, struct stat *st) { - (void) path, (void) st; - return -1; -} - -int mkdir(const char *path, mode_t mode) { - (void) path, (void) mode; - return -1; -} - -void _init(void) {} diff --git a/examples/stm32/nucleo-f429zi-make-freertos-builtin/sysinit.c b/examples/stm32/nucleo-f429zi-make-freertos-builtin/sysinit.c deleted file mode 100644 index 5e65284e15..0000000000 --- a/examples/stm32/nucleo-f429zi-make-freertos-builtin/sysinit.c +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) 2023 Cesanta Software Limited -// All rights reserved -// -// This file contains essentials required by the CMSIS: -// uint32_t SystemCoreClock - holds the system core clock value -// SystemInit() - initialises the system, e.g. sets up clocks - -#include "hal.h" - -uint32_t SystemCoreClock = SYS_FREQUENCY; - -void SystemInit(void) { // Called automatically by startup code - SCB->CPACR |= ((3UL << 10 * 2) | (3UL << 11 * 2)); // Enable FPU - asm("DSB"); - asm("ISB"); - FLASH->ACR |= FLASH_LATENCY | BIT(8) | BIT(9); // Flash latency, prefetch - RCC->PLLCFGR &= ~((BIT(17) - 1)); // Clear PLL multipliers - RCC->PLLCFGR |= (((PLL_P - 2) / 2) & 3) << 16; // Set PLL_P - RCC->PLLCFGR |= PLL_M | (PLL_N << 6); // Set PLL_M and PLL_N - RCC->CR |= BIT(24); // Enable PLL - while ((RCC->CR & BIT(25)) == 0) spin(1); // Wait until done - RCC->CFGR = (APB1_PRE << 10) | (APB2_PRE << 13); // Set prescalers - RCC->CFGR |= 2; // Set clock source to PLL - while ((RCC->CFGR & 12) == 0) spin(1); // Wait until done - - RCC->APB2ENR |= RCC_APB2ENR_SYSCFGEN; // Enable SYSCFG - rng_init(); // Initialise random number generator - SysTick_Config(SystemCoreClock / 1000); // Sys tick every 1ms -}