将ch554的编译文件修改为bin

Lotlab · Apr 13, 2020 · 9c3a7fe · 9c3a7fe
1 parent fe50fd2
commit 9c3a7fe
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,6 +19,7 @@ script:
   - cp template/Makefile.posix.template template/Makefile.posix
   - sed -i "s/\/usr\/local/\/tmp/g" template/Makefile.posix
   - cp -r /tmp/sdk/nRF5_SDK_15.3.0_59ac345/* SDK/
+  - git status
   - cd keyboard
   - make -j
   - cd ../
@@ -29,7 +30,7 @@ deploy:
   file_glob: true
   file: 
     - keyboard/_build/*.zip
-    - keyboard/_build/*.hex
+    - keyboard/_build/*.bin
   skip_cleanup: true
   on:
     tags: true

diff --git a/keyboard/Makefile b/keyboard/Makefile
@@ -11,7 +11,7 @@ all: $(SUBDIRS)
 $(SUBDIRS): $(OUTPUT_DIR)
 	@-mkdir $(OUTPUT_DIR)/$@
 	@make -C $@ package OUTPUT_DIRECTORY=$(RELEASE_DIR)/$@ NRF_PACKAGE_NAME=$(RELEASE_DIR)/$@-nrf52-$(FILE_VERSION).zip BUILD_PREFIX=$@
-	@make -C $@ usb OUTPUT_DIRECTORY=$(RELEASE_DIR)/$@ OUTPUT_HEX=$(RELEASE_DIR)/$@-ch554-$(FILE_VERSION).hex BUILD_PREFIX=$@
+	@make -C $@ usb OUTPUT_DIRECTORY=$(RELEASE_DIR)/$@ OUTPUT_BIN=$(RELEASE_DIR)/$@-ch554-$(FILE_VERSION).bin BUILD_PREFIX=$@
 
 $(OUTPUT_DIR):
 	@-mkdir -p $(OUTPUT_DIR)

diff --git a/keyboard/ergoconn/Makefile b/keyboard/ergoconn/Makefile
@@ -22,7 +22,7 @@ all: $(SUBDIRS)
 $(SUBDIRS): $(OUTPUT_DIR)
 	@-mkdir -p $(OUTPUT_DIR)/$@
 	@make -C $@ package OUTPUT_DIRECTORY=../$(OUTPUT_DIR)/$@ NRF_PACKAGE_NAME=../$(RELEASE_DIR)/$(BUILD_PREFIX)-$@-nrf52-$(FILE_VERSION).zip BUILD_PREFIX=$(BUILD_PREFIX)-$@
-	@make -C $@ usb OUTPUT_DIRECTORY=../$(OUTPUT_DIR)/$@ OUTPUT_HEX=../$(RELEASE_DIR)/$(BUILD_PREFIX)-$@-ch554-$(FILE_VERSION).hex BUILD_PREFIX=$(BUILD_PREFIX)-$@
+	@make -C $@ usb OUTPUT_DIRECTORY=../$(OUTPUT_DIR)/$@ OUTPUT_BIN=../$(RELEASE_DIR)/$(BUILD_PREFIX)-$@-ch554-$(FILE_VERSION).bin BUILD_PREFIX=$(BUILD_PREFIX)-$@
 
 $(OUTPUT_DIR):
 	@-mkdir -p $(OUTPUT_DIR)

diff --git a/keyboard/farad69/Makefile b/keyboard/farad69/Makefile
@@ -22,7 +22,7 @@ all: $(SUBDIRS)
 $(SUBDIRS): $(OUTPUT_DIR)
 	@-mkdir -p $(OUTPUT_DIR)/$@
 	@make -C $@ package OUTPUT_DIRECTORY=../$(OUTPUT_DIR)/$@ NRF_PACKAGE_NAME=../$(RELEASE_DIR)/$(BUILD_PREFIX)-$@-nrf52-$(FILE_VERSION).zip BUILD_PREFIX=$(BUILD_PREFIX)-$@
-	@make -C $@ usb OUTPUT_DIRECTORY=../$(OUTPUT_DIR)/$@ OUTPUT_HEX=../$(RELEASE_DIR)/$(BUILD_PREFIX)-$@-ch554-$(FILE_VERSION).hex BUILD_PREFIX=$(BUILD_PREFIX)-$@
+	@make -C $@ usb OUTPUT_DIRECTORY=../$(OUTPUT_DIR)/$@ OUTPUT_BIN=../$(RELEASE_DIR)/$(BUILD_PREFIX)-$@-ch554-$(FILE_VERSION).bin BUILD_PREFIX=$(BUILD_PREFIX)-$@
 
 $(OUTPUT_DIR):
 	@-mkdir -p $(OUTPUT_DIR)

diff --git a/keyboard/gt-ble60/Makefile b/keyboard/gt-ble60/Makefile
@@ -22,7 +22,7 @@ all: $(SUBDIRS)
 $(SUBDIRS): $(OUTPUT_DIR)
 	@-mkdir -p $(OUTPUT_DIR)/$@
 	@make -C $@ package OUTPUT_DIRECTORY=../$(OUTPUT_DIR)/$@ NRF_PACKAGE_NAME=../$(RELEASE_DIR)/$(BUILD_PREFIX)-$@-nrf52-$(FILE_VERSION).zip BUILD_PREFIX=$(BUILD_PREFIX)-$@
-	@make -C $@ usb OUTPUT_DIRECTORY=../$(OUTPUT_DIR)/$@ OUTPUT_HEX=../$(RELEASE_DIR)/$(BUILD_PREFIX)-$@-ch554-$(FILE_VERSION).hex BUILD_PREFIX=$(BUILD_PREFIX)-$@
+	@make -C $@ usb OUTPUT_DIRECTORY=../$(OUTPUT_DIR)/$@ OUTPUT_BIN=../$(RELEASE_DIR)/$(BUILD_PREFIX)-$@-ch554-$(FILE_VERSION).bin BUILD_PREFIX=$(BUILD_PREFIX)-$@
 
 $(OUTPUT_DIR):
 	@-mkdir -p $(OUTPUT_DIR)

diff --git a/keyboard/lot60-ble/Makefile b/keyboard/lot60-ble/Makefile
@@ -22,7 +22,7 @@ all: $(SUBDIRS)
 $(SUBDIRS): $(OUTPUT_DIR)
 	@-mkdir -p $(OUTPUT_DIR)/$@
 	@make -C $@ package OUTPUT_DIRECTORY=../$(OUTPUT_DIR)/$@ NRF_PACKAGE_NAME=../$(RELEASE_DIR)/$(BUILD_PREFIX)-$@-nrf52-$(FILE_VERSION).zip BUILD_PREFIX=$(BUILD_PREFIX)-$@
-	@make -C $@ usb OUTPUT_DIRECTORY=../$(OUTPUT_DIR)/$@ OUTPUT_HEX=../$(RELEASE_DIR)/$(BUILD_PREFIX)-$@-ch554-$(FILE_VERSION).hex BUILD_PREFIX=$(BUILD_PREFIX)-$@
+	@make -C $@ usb OUTPUT_DIRECTORY=../$(OUTPUT_DIR)/$@ OUTPUT_BIN=../$(RELEASE_DIR)/$(BUILD_PREFIX)-$@-ch554-$(FILE_VERSION).bin BUILD_PREFIX=$(BUILD_PREFIX)-$@
 
 $(OUTPUT_DIR):
 	@-mkdir -p $(OUTPUT_DIR)