Skip to content

Commit

Permalink
release v1.5
Browse files Browse the repository at this point in the history
- replace w/e RAM routines with OSS routines (see issues #4)
- remove STM8S 32kB v1.4 and 128kB v2.4 (development stopped)
- removed STM8S 256kB v1.0 (development stopped)
- fixed bug in v1.4.3 to flash w/e after CRC32-verify
  • Loading branch information
gicking committed Jan 23, 2021
1 parent fde5ed3 commit 68e6a7a
Show file tree
Hide file tree
Showing 52 changed files with 1,337 additions and 1,112 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,4 @@ tool_validation.*
*_dump.txt
/test-erase/*
/binaries
/RAM_Routines/STM_write_erase.zip
16 changes: 9 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
# Project: stm8gal

CC = gcc
CFLAGS = -c -Wall -I./RAM_Routines
CFLAGS = -c -Wall -I./RAM_Routines/write_erase -I./RAM_Routines/verify_CRC32
#CFLAGS += -DDEBUG
LDFLAGS = -g3 -lm
SOURCES = bootloader.c hexfile.c main.c misc.c serial_comm.c spi_Arduino_comm.c verify_CRC32.c
INCLUDES = misc.h bootloader.h hexfile.h serial_comm.h spi_spidev_comm.h spi_Arduino_comm.h verify_CRC32.h main.h
RAMROUTINES = RAM_Routines/E_W_ROUTINEs_128K_ver_2.1.s19 RAM_Routines/E_W_ROUTINEs_128K_ver_2.0.s19 RAM_Routines/E_W_ROUTINEs_256K_ver_1.0.s19 RAM_Routines/E_W_ROUTINEs_32K_ver_1.3.s19 RAM_Routines/E_W_ROUTINEs_32K_ver_1.4.s19 RAM_Routines/E_W_ROUTINEs_128K_ver_2.2.s19 RAM_Routines/E_W_ROUTINEs_32K_ver_1.0.s19 RAM_Routines/E_W_ROUTINEs_128K_ver_2.4.s19 RAM_Routines/E_W_ROUTINEs_32K_ver_1.2.s19 RAM_Routines/E_W_ROUTINEs_32K_verL_1.0.s19 RAM_Routines/E_W_ROUTINEs_8K_verL_1.0.s19
RAMINCLUDES = $(RAMROUTINES:.s19=.h)
RAMINCLUDES = \
RAM_Routines/write_erase/erase_write_verL_8k_1.0_inc.h \
RAM_Routines/write_erase/erase_write_ver_32k_1.0_inc.h \
RAM_Routines/write_erase/erase_write_ver_32k_1.2_inc.h \
RAM_Routines/write_erase/erase_write_ver_32k_1.3_inc.h \
RAM_Routines/write_erase/erase_write_ver_128k_2.0_inc.h \
RAM_Routines/write_erase/erase_write_ver_128k_2.1_inc.h \
RAM_Routines/write_erase/erase_write_ver_128k_2.2_inc.h
OBJDIR = Objects
OBJECTS = $(patsubst %.c, $(OBJDIR)/%.o, $(SOURCES))
BIN = stm8gal
Expand Down Expand Up @@ -45,10 +51,6 @@ $(OBJDIR):
clean:
${RM} $(OBJECTS) $(OBJDIR) $(BIN) $(BIN).exe *~ .DS_Store

# convert RAM routines to C headers for inclusion into stm8gal
%.h: %.s19 $(RAMROUTINES)
xxd -i $< > $@

# link application
$(BIN): $(OBJECTS) $(OBJDIR)
$(CC) $(LDFLAGS) $(OBJECTS) -o $@
Expand Down
10 changes: 5 additions & 5 deletions Makefile.win
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ CC = gcc.exe
WINDRES = windres.exe
OBJ = Objects/main.o Objects/misc.o Objects/serial_comm.o Objects/bootloader.o Objects/hexfile.o Objects/spi_Arduino_comm.o Objects/verify_CRC32.o
LINKOBJ = Objects/main.o Objects/misc.o Objects/serial_comm.o Objects/bootloader.o Objects/hexfile.o Objects/spi_Arduino_comm.o Objects/verify_CRC32.o
LIBS = -L"C:/Program Files/Dev-Cpp/MinGW64/x86_64-w64-mingw32/lib32" -static-libgcc -m32
INCS = -I"C:/Program Files/Dev-Cpp/MinGW64/include" -I"C:/Program Files/Dev-Cpp/MinGW64/x86_64-w64-mingw32/include" -I"C:/Program Files/Dev-Cpp/MinGW64/lib/gcc/x86_64-w64-mingw32/4.9.2/include" -I"./RAM_Routines"
CXXINCS = -I"C:/Program Files/Dev-Cpp/MinGW64/include" -I"C:/Program Files/Dev-Cpp/MinGW64/x86_64-w64-mingw32/include" -I"C:/Program Files/Dev-Cpp/MinGW64/lib/gcc/x86_64-w64-mingw32/4.9.2/include" -I"C:/Program Files/Dev-Cpp/MinGW64/lib/gcc/x86_64-w64-mingw32/4.9.2/include/c++" -I"./RAM_Routines"
LIBS = -L"C:/Program Files/Dev-Cpp/MinGW64/lib" -L"C:/Program Files/Dev-Cpp/MinGW64/x86_64-w64-mingw32/lib" -static-libgcc
INCS = -I"C:/Program Files/Dev-Cpp/MinGW64/include" -I"C:/Program Files/Dev-Cpp/MinGW64/x86_64-w64-mingw32/include" -I"C:/Program Files/Dev-Cpp/MinGW64/lib/gcc/x86_64-w64-mingw32/4.9.2/include" -I"./RAM_Routines/write_erase" -I"./RAM_Routines/verify_CRC32"
CXXINCS = -I"C:/Program Files/Dev-Cpp/MinGW64/include" -I"C:/Program Files/Dev-Cpp/MinGW64/x86_64-w64-mingw32/include" -I"C:/Program Files/Dev-Cpp/MinGW64/lib/gcc/x86_64-w64-mingw32/4.9.2/include" -I"C:/Program Files/Dev-Cpp/MinGW64/lib/gcc/x86_64-w64-mingw32/4.9.2/include/c++" -I"./RAM_Routines/write_erase" -I"./RAM_Routines/verify_CRC32"
BIN = stm8gal.exe
CXXFLAGS = $(CXXINCS) -m32 -std=gnu99
CFLAGS = $(INCS) -m32 -std=gnu99
CXXFLAGS = $(CXXINCS) -std=gnu99
CFLAGS = $(INCS) -std=gnu99
RM = rm.exe -f

.PHONY: all all-before all-after clean clean-custom
Expand Down
67 changes: 0 additions & 67 deletions RAM_Routines/E_W_ROUTINEs_128K_ver_2.0.h

This file was deleted.

88 changes: 0 additions & 88 deletions RAM_Routines/E_W_ROUTINEs_128K_ver_2.1.h

This file was deleted.

Loading

0 comments on commit 68e6a7a

Please sign in to comment.