This commit is contained in:
pvvx 2017-02-03 21:51:00 +03:00
parent 04bbc93374
commit 1145aed8fb
8 changed files with 14 additions and 13 deletions

View file

@ -936,10 +936,10 @@
<useDefaultCommand>true</useDefaultCommand> <useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders> <runAllBuilders>true</runAllBuilders>
</target> </target>
<target name="flash" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> <target name="flash_OTA" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>mingw32-make.exe</buildCommand> <buildCommand>mingw32-make.exe</buildCommand>
<buildArguments>-s</buildArguments> <buildArguments>-s</buildArguments>
<buildTarget>flash</buildTarget> <buildTarget>flash_OTA</buildTarget>
<stopOnError>true</stopOnError> <stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand> <useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>false</runAllBuilders> <runAllBuilders>false</runAllBuilders>

View file

@ -8,7 +8,6 @@
<buildSpec> <buildSpec>
<buildCommand> <buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name> <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>

View file

@ -16,6 +16,6 @@ echo define call3>>flasher/flash_file.jlink
echo FlasherWrite %img_file% $Image2Addr $Image2Size>>flasher/flash_file.jlink echo FlasherWrite %img_file% $Image2Addr $Image2Size>>flasher/flash_file.jlink
echo end>>flasher/flash_file.jlink echo end>>flasher/flash_file.jlink
start JLinkGDBServer.exe -device Cortex-M3 -if SWD -ir -endian little -speed 3500 start JLinkGDBServer.exe -device Cortex-M3 -if SWD -ir -endian little -speed 3500
arm-none-eabi-gdb.exe -x flasher/gdb_wrflash.jlink build/bin/ram_all.bin arm-none-eabi-gdb.exe -x flasher/gdb_wrflash.jlink
taskkill /F /IM JLinkGDBServer.exe taskkill /F /IM JLinkGDBServer.exe

View file

@ -26,7 +26,11 @@ debug:
ramdebug: ramdebug:
@$(MAKE) -f application.mk ramdebug @$(MAKE) -f application.mk ramdebug
.PHONY: flashburn runram reset test readfullflash .PHONY: flash_OTA flashburn runram reset test readfullflash
flash_OTA:
JLinkGDB_OTA.bat
flashburn: flashburn:
JLinkGDB-WrFlash.bat JLinkGDB-WrFlash.bat
#@$(MAKE) -f flasher.mk flashburn #@$(MAKE) -f flasher.mk flashburn

View file

@ -222,12 +222,11 @@ if $rtl8710_flasher_capacity == 0
monitor go monitor go
FlasherWait FlasherWait
set $id = {int}($rtl8710_flasher_buffer + 0x0C) set $id = {int}($rtl8710_flasher_buffer + 0x0C)
set $rtl8710_flasher_capacity = 1 << (($id >> 16) & 0x0ff)
if ($id == 0x1420c2) if ($id == 0x1420c2)
set $rtl8710_flasher_capacity = 1 << (($id >> 16) & 0x0ff)
printf "Flash ID = 0x%08x : MX25L8006E (%d kbytes)\n", $id, $rtl8710_flasher_capacity>>10 printf "Flash ID = 0x%08x : MX25L8006E (%d kbytes)\n", $id, $rtl8710_flasher_capacity>>10
else else
set $rtl8710_flasher_capacity = 1024*1024) printf "Flash ID = 0x%08x : (%d kbytes)\n", $id, $rtl8710_flasher_capacity>>10
error "Flash ID = 0x%08x : ?\n", $id
end end
printf "RTL8710 flasher initialized\n" printf "RTL8710 flasher initialized\n"
else else

View file

@ -37,12 +37,11 @@ if $rtl8710_flasher_capacity == 0
monitor go monitor go
FlasherWait FlasherWait
set $id = {int}($rtl8710_flasher_buffer + 0x0C) set $id = {int}($rtl8710_flasher_buffer + 0x0C)
set $rtl8710_flasher_capacity = 1 << (($id >> 16) & 0x0ff)
if ($id == 0x1420c2) if ($id == 0x1420c2)
set $rtl8710_flasher_capacity = 1 << (($id >> 16) & 0x0ff)
printf "Flash ID = 0x%08x : MX25L8006E (%d kbytes)\n", $id, $rtl8710_flasher_capacity>>10 printf "Flash ID = 0x%08x : MX25L8006E (%d kbytes)\n", $id, $rtl8710_flasher_capacity>>10
else else
set $rtl8710_flasher_capacity = 1024*1024) printf "Flash ID = 0x%08x : (%d kbytes)\n", $id, $rtl8710_flasher_capacity>>10
error "Flash ID = 0x%08x : ?\n", $id
end end
printf "RTL8710 flasher initialized\n" printf "RTL8710 flasher initialized\n"
else else

View file

@ -1 +1 @@
PATH=D:\MCU\GNU_Tools_ARM_Embedded\5.2_2015q4\bin;D:\MCU\SEGGER\JLink_V612f;%PATH% PATH=D:\MCU\GNU_Tools_ARM_Embedded\5.4_2016q2\bin;D:\MCU\SEGGER\JLink_V612i;%PATH%

View file

@ -20,7 +20,7 @@
#if CONFIG_LOG_HISTORY #if CONFIG_LOG_HISTORY
#define LOG_HISTORY_LEN 5 #define LOG_HISTORY_LEN 5
#endif #endif
#define SUPPORT_INTERACTIVE_MOD 1 //on/off wifi_interactive_mode #define SUPPORT_INTERACTIVE_MODE 0 //on/off wifi_interactive_mode
#define CONFIG_LOG_SERVICE_LOCK 0 #define CONFIG_LOG_SERVICE_LOCK 0
#endif #endif