Title: Update ameba_tools_windows

ambiot · Jan 23, 2020 · c8e0169 · c8e0169
1 parent ac857fb
commit c8e0169
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/Arduino_package/ameba_tools_windows/tools/windows/src/upload_dap.cpp b/Arduino_package/ameba_tools_windows/tools/windows/src/upload_dap.cpp
@@ -89,6 +89,8 @@ int main(int argc, char *argv[]) {
 	stringstream ss;
 	string disk_caption;
 	string disk_volumename;
+	string mbed_caption;
+	string mbed_volumename;
 	string filepath;
 
 	string filepath_ram_all;
@@ -110,12 +112,16 @@ int main(int argc, char *argv[]) {
 
 			for (iter = lines.begin() + 1; iter != lines.end() - 1; iter++) { //This for loop store the cmd result into disk_caption nad disk_volumename and compare result until "MBED" is found
 				ss.clear();
+				disk_caption.clear();
+				disk_volumename.clear();
 				ss.str(*iter);
 				ss >> disk_caption >> disk_volumename;
 
 				if (disk_volumename.compare("MBED") == 0) {
 					mbed_disk_found = true;
 					no_of_ameba_found++;
+					mbed_caption = disk_caption;
+					mbed_volumename = disk_volumename;
 
 					if (no_of_ameba_found >= 2) {
 						second_ameba_found = true;
@@ -140,7 +146,7 @@ int main(int argc, char *argv[]) {
 		}
 
 		// 2. check if MBED disk is accessable
-		filepath = disk_caption + "\\mbed.htm";
+		filepath = mbed_caption + "\\mbed.htm";
 		if (!isFileExist(filepath)) {
 			cout << "ERR: Cannot access mbed driver!" << endl;
 			break;
@@ -156,7 +162,7 @@ int main(int argc, char *argv[]) {
 		cout << "uploading..." << endl;
 		cmd = "copy \"" + filepath_ram_all;
 		cmd.append("\" ");
-		cmd.append(disk_caption);
+		cmd.append(mbed_caption);
 		cout << cmd << endl;
 		system(cmd.c_str());
 

diff --git a/Arduino_package/ameba_tools_windows/upload_dap.exe b/Arduino_package/ameba_tools_windows/upload_dap.exe
diff --git a/Arduino_package/package_realtek.com_ameba1_early_index.json b/Arduino_package/package_realtek.com_ameba1_early_index.json
@@ -1206,8 +1206,8 @@
               "host": "i686-mingw32",
               "archiveFileName": "ameba_tools_windows-1.1.1.tar.gz",
               "url": "https://github.com/ambiot/amb1_arduino/raw/master/Arduino_package/release/ameba_tools_windows-1.1.1.tar.gz",
-              "checksum": "SHA-256:10fa8d7bd50e2625a123c1547b643e4d5437e1b3f983d22de664a89cd681d877",
-              "size": "988627"
+              "checksum": "SHA-256:7cb9c430967c0213a87784ea0b015de7a83e79cc774d1f8032561104ea64d14a",
+              "size": "989120"
             },
             {
               "host": "x86_64-apple-darwin",

diff --git a/Arduino_package/package_realtek.com_ameba1_index.json b/Arduino_package/package_realtek.com_ameba1_index.json
@@ -741,8 +741,8 @@
               "host": "i686-mingw32",
               "archiveFileName": "ameba_tools_windows-1.1.1.tar.gz",
               "url": "https://github.com/ambiot/amb1_arduino/raw/master/Arduino_package/release/ameba_tools_windows-1.1.1.tar.gz",
-              "checksum": "SHA-256:10fa8d7bd50e2625a123c1547b643e4d5437e1b3f983d22de664a89cd681d877",
-              "size": "988627"
+              "checksum": "SHA-256:7cb9c430967c0213a87784ea0b015de7a83e79cc774d1f8032561104ea64d14a",
+              "size": "989120"
             },
             {
               "host": "x86_64-apple-darwin",

diff --git a/Arduino_package/package_realtek.com_ameba1_raw_index.json b/Arduino_package/package_realtek.com_ameba1_raw_index.json
@@ -741,8 +741,8 @@
               "host": "i686-mingw32",
               "archiveFileName": "ameba_tools_windows-1.1.1.tar.gz",
               "url": "https://github.com/ambiot/amb1_arduino/raw/master/Arduino_package/release/ameba_tools_windows-1.1.1.tar.gz",
-              "checksum": "SHA-256:10fa8d7bd50e2625a123c1547b643e4d5437e1b3f983d22de664a89cd681d877",
-              "size": "988627"
+              "checksum": "SHA-256:7cb9c430967c0213a87784ea0b015de7a83e79cc774d1f8032561104ea64d14a",
+              "size": "989120"
             },
             {
               "host": "x86_64-apple-darwin",

diff --git a/Arduino_package/release/ameba_tools_windows-1.1.1.tar.gz b/Arduino_package/release/ameba_tools_windows-1.1.1.tar.gz