release 1.3.3 version

BWallet · May 5, 2015 · 2f101e0 · 2f101e0
1 parent 98820b1
commit 2f101e0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/README b/README
@@ -6,8 +6,8 @@ BWalletFirmware
 bootloader v1.3.2 
 https://github.com/BWallet/bwallet-mcu/releases/tag/1.3.0
 
-firmware v1.3.2
-hash: e3305fad63721c1061672da92d72de974b4eac15368fdab712f6f88cf5963374
+firmware v1.3.3
+hash: a8100efdb655a886b9f177001e20d81f8adf4eda85e40311cab6ffb2e2aec99b
 
 系统环境：ubuntu:14.04 32bit
 
@@ -32,7 +32,7 @@ $make
 git clone https://github.com/BWallet/bwallet-mcu.git
 $cd bwallet-mcu/
 $git submodule update --recursive --init
-$git checkout 1.3.2
+$git checkout 1.3.3
 $git submodule update
 $make
 $cd bwallet-mcu/firmware

diff --git a/firmware/Makefile b/firmware/Makefile
@@ -1,4 +1,4 @@
-APPVER = 1.3.2
+APPVER = 1.3.3
 
 NAME  = bwallet
 

diff --git a/firmware/bwallet.h b/firmware/bwallet.h
@@ -22,7 +22,7 @@
 
 #define VERSION_MAJOR 1
 #define VERSION_MINOR 3
-#define VERSION_PATCH 2
+#define VERSION_PATCH 3
 
 #define STR(X) #X
 #define VERSTR(X) STR(X)

diff --git a/firmware/storage.c b/firmware/storage.c
@@ -64,7 +64,7 @@ static char sessionPassphrase[51];
  0x0010 |  ?          |  Storage structure
  */
 
-#define STORAGE_VERSION 4
+#define STORAGE_VERSION 5
 
 void storage_from_flash(uint32_t version)
 {
@@ -81,6 +81,9 @@ void storage_from_flash(uint32_t version)
 		case 4: // copy(since 1.3.2)
 			memcpy(&storage, (void *)(FLASH_STORAGE_START + 4 + sizeof(storage_uuid)), sizeof(Storage));
 			break;
+		case 5: // copy(since 1.3.3)
+			memcpy(&storage, (void *)(FLASH_STORAGE_START + 4 + sizeof(storage_uuid)), sizeof(Storage));
+			break;
 	}
 	storage.version = STORAGE_VERSION;
 }

diff --git a/memory_app_1.3.2.ld → memory_app_1.3.3.ld b/memory_app_1.3.2.ld → memory_app_1.3.3.ld