Merge remote-tracking branch 'original/main' into merge-220325

This commit is contained in:
Vincent Barrilliot 2022-03-25 17:56:02 +01:00
commit d4ccc4a301
4 changed files with 5865 additions and 5872 deletions

View file

@ -24,8 +24,8 @@ export CC = vc
export DEFINES = -DCPU=$(CPU) -DMODEL=$(MODEL) # -DKBD_POLLED
ifeq ($(OS),Windows_NT)
export CFLAGS = +$(VBCC)/config/m68k-foenix -I. -I$(CURDIR)/include -I$(CURDIR)
# export CFLAGS = +$(VBCC)/config/a2560u_flash -I. -I$(CURDIR)/include -I$(CURDIR)
#export CFLAGS = +$(VBCC)/config/m68k-foenix -I. -I$(CURDIR)/include -I$(CURDIR)
export CFLAGS = +$(VBCC)/config/a2560u_flash -I. -I$(CURDIR)/include -I$(CURDIR)
export RM = cmd /C del /Q /F
else
#export CFLAGS = +$(VBCC)/config/m68k-foenix-linux -I. -I$(CURDIR)/include -I$(CURDIR)

Binary file not shown.

View file

@ -88,8 +88,8 @@
#define UART_9600 130 /* Code for 9600 bps */
#define UART_19200 65 /* Code for 19200 bps */
#define UART_38400 33 /* Code for 28400 bps */
#define UART_57600 22 /* Code for 57600 bps */
#define UART_115200 11 /* Code for 115200 bps */
#define UART_57600 21 /* Code for 57600 bps */
#define UART_115200 10 /* Code for 115200 bps */
#else

11729
src/mapfile

File diff suppressed because it is too large Load diff