diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e399199..ce04bbc 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -20,7 +20,11 @@ - + + + + + - { - "keyToString": { - "ASKED_ADD_EXTERNAL_FILES": "true", - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "RunOnceActivity.cidr.known.project.marker": "true", - "SHARE_PROJECT_CONFIGURATION_FILES": "true", - "WebServerToolWindowFactoryState": "false", - "cf.first.check.clang-format": "false", - "cidr.known.project.marker": "true", - "last_opened_file_path": "C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese/app", - "node.js.detected.package.eslint": "true", - "node.js.detected.package.tslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "node.js.selected.package.tslint": "(autodetect)", - "nodejs_package_manager_path": "npm", - "settings.editor.selected.configurable": "File.Encoding", - "structure.view.defaults.are.configured": "true", - "vue.rearranger.settings.migration": "true" + +}]]> @@ -97,25 +101,10 @@ - - diff --git a/Makefile b/Makefile index 7a30b2a..5c96ca5 100644 --- a/Makefile +++ b/Makefile @@ -210,7 +210,7 @@ endif OBJCOPY = arm-none-eabi-objcopy SIZE = arm-none-eabi-size -AUTHOR_STRING := EGZUMER +AUTHOR_STRING := LOSEHU # the user might not have/want git installed # can set own version string here (max 7 chars) ifneq (, $(shell $(WHERE) git)) @@ -433,7 +433,7 @@ else ifneq (,$(HAS_CRCMOD)) $(info !!!!!!!! run: pip install crcmod) $(info ) else - -$(MY_PYTHON) fw-pack.py $<.bin $(AUTHOR_STRING) $(VERSION_STRING) $<.packed.bin + -$(MY_PYTHON) fw-pack.py $<.bin $(AUTHOR_STRING) $<.packed.bin endif $(SIZE) $< diff --git a/clean.bat b/clean.bat index 485cbbc..dd9dc7d 100644 --- a/clean.bat +++ b/clean.bat @@ -15,4 +15,4 @@ for /d /r %%i in (*) do ( popd ) -echo "删除完成" +echo OK