Replace dfu-convert.c by hex2dfu.c

hydrabus · Jun 12, 2024 · 43ce1d4 · 43ce1d4
1 parent 9f99167
commit 43ce1d4
Show file tree

Hide file tree

Showing 5 changed files with 585 additions and 274 deletions.
diff --git a/src/Makefile b/src/Makefile
@@ -6,14 +6,6 @@
 .SUFFIXES: # Delete the default suffixes
 MAKEFLAGS += --no-builtin-rules
 
-ifeq ($(OS), Windows_NT)
- PYTHON = python
-else ifeq ($(shell which python3),)
- PYTHON = python
-else
- PYTHON = python3
-endif
-
 # Set CPU target (default STM32F4XX)
 export STM32F4XX ?= 1
 
@@ -345,7 +337,8 @@ FORCE:
 
 %.dfu: %.hex $(LDSCRIPT)
  $(OUT_LOG) echo Creating $@
- $(OUT_CMD) build-scripts/dfu-convert -r $(FW_REVISION) -i $< $@
+ $(OUT_LOG) echo ./build-scripts/hex2dfu -l ST... -r $(FW_REVISION) -i $< -o $@
+ $(OUT_CMD) ./build-scripts/hex2dfu -l ST... -r $(FW_REVISION) -i $< -o $@
 
 # This rule hook is defined in the ChibiOS build system
 PRE_MAKE_ALL_RULE_HOOK: ./common/hydrafw_version.hdr

diff --git a/src/build-scripts/Makefile b/src/build-scripts/Makefile
@@ -4,10 +4,10 @@ CC = gcc
 CFLAGS = -Wall -Wextra -std=c99
 
 # Source files
-SRCS = dfu-convert.c
+SRCS = hex2dfu.c
 
 # Output executable
-TARGET = dfu-convert
+TARGET = hex2dfu
 
 # Default target
 all: $(TARGET)

diff --git a/src/build-scripts/dfu-convert.c b/src/build-scripts/dfu-convert.c