From 1145aed8fbc85ba43027c4643b38049b8850c49f Mon Sep 17 00:00:00 2001
From: pvvx <pvvx@mail.ru>
Date: Fri, 3 Feb 2017 21:51:00 +0300
Subject: [PATCH] update

---
 .cproject                   | 4 ++--
 .project                    | 1 -
 JLinkGDB-WrFlash.bat        | 2 +-
 Makefile                    | 6 +++++-
 flasher/gdb_ota.jlink       | 5 ++---
 flasher/gdb_wrflash.jlink   | 5 ++---
 paths.bat                   | 2 +-
 project/inc/platform_opts.h | 2 +-
 8 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.cproject b/.cproject
index 78585e4..c2ce21c 100644
--- a/.cproject
+++ b/.cproject
@@ -936,10 +936,10 @@
 				<useDefaultCommand>true</useDefaultCommand>
 				<runAllBuilders>true</runAllBuilders>
 			</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>
 				<buildArguments>-s</buildArguments>
-				<buildTarget>flash</buildTarget>
+				<buildTarget>flash_OTA</buildTarget>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>true</useDefaultCommand>
 				<runAllBuilders>false</runAllBuilders>
diff --git a/.project b/.project
index 65aac85..c952035 100644
--- a/.project
+++ b/.project
@@ -8,7 +8,6 @@
 	<buildSpec>
 		<buildCommand>
 			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
 			<arguments>
 			</arguments>
 		</buildCommand>
diff --git a/JLinkGDB-WrFlash.bat b/JLinkGDB-WrFlash.bat
index 9f58d24..c70f651 100644
--- a/JLinkGDB-WrFlash.bat
+++ b/JLinkGDB-WrFlash.bat
@@ -16,6 +16,6 @@ echo define call3>>flasher/flash_file.jlink
 echo FlasherWrite %img_file% $Image2Addr $Image2Size>>flasher/flash_file.jlink
 echo end>>flasher/flash_file.jlink
 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
 
diff --git a/Makefile b/Makefile
index 9a22419..7332ce1 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,11 @@ debug:
 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: 
 	JLinkGDB-WrFlash.bat
 	#@$(MAKE) -f flasher.mk flashburn
diff --git a/flasher/gdb_ota.jlink b/flasher/gdb_ota.jlink
index 010b7a7..9ed1306 100644
--- a/flasher/gdb_ota.jlink
+++ b/flasher/gdb_ota.jlink
@@ -222,12 +222,11 @@ if $rtl8710_flasher_capacity == 0
  monitor go
  FlasherWait
  set $id = {int}($rtl8710_flasher_buffer + 0x0C)
+ set $rtl8710_flasher_capacity = 1 << (($id >> 16) & 0x0ff)
  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
  else 
-  set $rtl8710_flasher_capacity = 1024*1024)
-  error "Flash ID = 0x%08x : ?\n", $id
+  printf "Flash ID = 0x%08x : (%d kbytes)\n", $id, $rtl8710_flasher_capacity>>10
  end
  printf "RTL8710 flasher initialized\n"
 else
diff --git a/flasher/gdb_wrflash.jlink b/flasher/gdb_wrflash.jlink
index 4a4af92..4c740fd 100644
--- a/flasher/gdb_wrflash.jlink
+++ b/flasher/gdb_wrflash.jlink
@@ -37,12 +37,11 @@ if $rtl8710_flasher_capacity == 0
  monitor go
  FlasherWait
  set $id = {int}($rtl8710_flasher_buffer + 0x0C)
+ set $rtl8710_flasher_capacity = 1 << (($id >> 16) & 0x0ff)
  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
  else 
-  set $rtl8710_flasher_capacity = 1024*1024)
-  error "Flash ID = 0x%08x : ?\n", $id
+  printf "Flash ID = 0x%08x : (%d kbytes)\n", $id, $rtl8710_flasher_capacity>>10
  end
  printf "RTL8710 flasher initialized\n"
 else
diff --git a/paths.bat b/paths.bat
index 76b3a62..374f93e 100644
--- a/paths.bat
+++ b/paths.bat
@@ -1 +1 @@
-PATH=D:\MCU\GNU_Tools_ARM_Embedded\5.2_2015q4\bin;D:\MCU\SEGGER\JLink_V612f;%PATH%
\ No newline at end of file
+PATH=D:\MCU\GNU_Tools_ARM_Embedded\5.4_2016q2\bin;D:\MCU\SEGGER\JLink_V612i;%PATH%
\ No newline at end of file
diff --git a/project/inc/platform_opts.h b/project/inc/platform_opts.h
index 9590c00..09fcd65 100644
--- a/project/inc/platform_opts.h
+++ b/project/inc/platform_opts.h
@@ -20,7 +20,7 @@
 #if CONFIG_LOG_HISTORY
 #define LOG_HISTORY_LEN    5
 #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
 #endif