Fix Java PATH problem on Windows (Fix Issue #813)

Merge pull request #814 from dadul96/Fix_Java_PATH_problem_Windows

Author: stevstrong

STM32F1/platform.txt

@@ -118,7 +118,7 @@ tools.maple_upload.path.linux={runtime.hardware.path}/tools/linux
 tools.maple_upload.path.linux64={runtime.hardware.path}/tools/linux64    
 tools.maple_upload.upload.params.verbose=-d
 tools.maple_upload.upload.params.quiet=
-tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}.bin"
+tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}.bin" "{runtime.ide.path}"
 
 #Added tool for generic STM32 upload via serial to Serial Port 1 (pins PA9 and PA10) - note. Boot0 line needs to high on board reset to enable upload via serial
 # at the end up the upload the program is automatically run, without the board being reset

tools/win/maple_upload.bat

@@ -5,7 +5,8 @@ set driverLetter=%~dp0
 set driverLetter=%driverLetter:~0,2%
 %driverLetter%
 cd %~dp0
-java -jar maple_loader.jar %1 %2 %3 %4 %5 %6 %7 %8 %9
+set PATH=%5\java\bin;%PATH%
+java -jar maple_loader.jar %1 %2 %3 %4
 
 for /l %%x in (1, 1, 40) do (
   ping -w 50 -n 1 192.0.2.1 > nul