Skip to content

Commit

Permalink
Sync with local development
Browse files Browse the repository at this point in the history
  • Loading branch information
vanvught committed Mar 1, 2024
1 parent 9605ef4 commit 2470fe7
Show file tree
Hide file tree
Showing 19 changed files with 174 additions and 853 deletions.
5 changes: 4 additions & 1 deletion firmware-template-gd32/Board.mk
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,17 @@ endif

ifeq ($(strip $(BOARD)),BOARD_BW_OPIDMX4)
BOARD_DMX=4
DEFINES+=-DCONFIG_STORE_USE_SPI
endif

ifeq ($(strip $(BOARD)),BOARD_DMX3)
BOARD_DMX=3
DEFINES+=-DCONFIG_STORE_USE_SPI
endif

ifeq ($(strip $(BOARD)),BOARD_DMX4)
BOARD_DMX=4
DEFINES+=-DCONFIG_STORE_USE_SPI
BOARD_DMX=4
endif

ifdef BOARD_DMX
Expand Down
35 changes: 0 additions & 35 deletions firmware-template-gd32/FreeRTOS.mk

This file was deleted.

2 changes: 1 addition & 1 deletion firmware-template-gd32/Mcu.mk
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ ifeq ($(strip $(MCU)),GD32F470ZK)
endif

ifeq ($(strip $(MCU)),GD32H759IM)
LINKER=$(FIRMWARE_DIR)gd32h7xx_M_flash.ld
LINKER=$(FIRMWARE_DIR)gd32h7xx_xM_flash.ld
FAMILY=gd32h7xx
LINE=gd32h759
endif
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1709299380;
1 change: 1 addition & 0 deletions gd32_emac_artnet_pixel_multi/include/software_version_id.h
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1709299414;
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1709299424;
1 change: 1 addition & 0 deletions gd32_emac_ddp_pixel_multi/include/software_version_id.h
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1709299435;
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1709299453;
1 change: 1 addition & 0 deletions gd32_emac_e131_pixel_multi/include/software_version_id.h
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1709299463;
70 changes: 46 additions & 24 deletions include/stdio.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @file stdio.h
*
*/
/* Copyright (C) 2017-2020 by Arjan van Vught mailto:[email protected]
/* Copyright (C) 2017-2024 by Arjan van Vught mailto:[email protected]
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand All @@ -28,10 +28,29 @@

#include <stddef.h>
#include <stdarg.h>

#define EOF -1

typedef void *FILE;
#include <stdint.h>

#define EOF (-1)

typedef struct __sFILE {
void *udata;
#define __SLBF 0x0001 /* line buffered */
#define __SNBF 0x0002 /* unbuffered */
#define __SRD 0x0004 /* OK to read */
#define __SWR 0x0008 /* OK to write */
/* RD and WR are never simultaneously asserted */
#define __SRW 0x0010 /* open for reading & writing */
#define __SEOF 0x0020 /* found EOF */
#define __SERR 0x0040 /* found error */
uint8_t flags;
} FILE;

#if defined(CONFIG_POSIX_ENABLE_STDIN)
#error Not supported
extern FILE *stdin;
extern FILE *stdout;
extern FILE *stderr;
#endif

#ifndef SEEK_SET
#define SEEK_SET 0 /* set file offset to offset */
Expand All @@ -49,36 +68,39 @@ typedef void *FILE;
extern "C" {
#endif

extern int puts(const char *s);
extern int putchar(int c);
int puts(const char *s);
int putchar(int c);

int fileno(FILE *stream);

extern FILE *fopen(const char *path, const char *mode);
extern int fclose(FILE *stream);
FILE *fopen(const char *path, const char *mode);
int fclose(FILE *stream);

extern int fgetc(FILE *stream);
int fgetc(FILE *stream);

extern char *fgets(char *s, int size, FILE *stream);
extern int fputs(const char *s, FILE *stream);
char *fgets(char *s, int size, FILE *stream);
int fputs(const char *s, FILE *stream);

extern size_t fread(void *ptr, size_t size, size_t nmemb, FILE *stream);
extern size_t fwrite(const void *ptr, size_t size, size_t nmemb, FILE *stream);
size_t fread(void *ptr, size_t size, size_t nmemb, FILE *stream);
size_t fwrite(const void *ptr, size_t size, size_t nmemb, FILE *stream);

extern int fseek(FILE *stream, long offset, int whence);
int fseek(FILE *stream, long offset, int whence);

extern long ftell(FILE *stream);
long ftell(FILE *stream);

extern void clearerr(FILE *stream);
extern int ferror(FILE *stream);
void clearerr(FILE *stream);
int ferror(FILE *stream);
int feof(FILE *stream);

extern int printf(const char *format, ...);
int printf(const char *format, ...);

extern int sprintf(char *str, const char *format, ...);
extern int snprintf(char *str, size_t size, const char *format, ...);
int sprintf(char *str, const char *format, ...);
int snprintf(char *str, size_t size, const char *format, ...);

extern int vprintf(const char *format, va_list ap);
extern int vsnprintf(char *str, size_t size, const char *format, va_list);
int vprintf(const char *format, va_list ap);
int vsnprintf(char *str, size_t size, const char *format, va_list);

extern void perror(const char *s);
void perror(const char *s);

#ifdef __cplusplus
}
Expand Down
50 changes: 0 additions & 50 deletions lib-dmx/include/gd32/board_gd32f470z_eval.h

This file was deleted.

164 changes: 0 additions & 164 deletions lib-gd32/include/FreeRTOSConfig.h

This file was deleted.

Loading

0 comments on commit 2470fe7

Please sign in to comment.