Merge branch 'master' of https://github.com/rogerclarkmelbourne/Arduino_STM32

Author: rogerclarkmelbourne

STM32F1/cores/maple/tone.cpp

@@ -31,7 +31,7 @@
 	#define TONE_TIMER 8
 	#endif
 	#ifndef TONE_CHANNEL
-	#define TONE_CHANNEL 8
+	#define TONE_CHANNEL 4
 	#endif
 
 	HardwareTimer TTimer1(1), TTimer2(2), TTimer3(3), TTimer4(4),TTimer5(5), TTimer6(6), TTimer7(7), TTimer8(8);

tools/linux64/hid-flash

@@ -1,4 +1,4 @@
-rem @echo off
+@echo off
 rem: Note %~dp0 get path of this batch file
 rem: Need to change drive if My Documents is on a drive other than C:
 set driverLetter=%~dp0
@@ -14,4 +14,4 @@ rem: ------------- use STLINK CLI
 stlink\ST-LINK_CLI.exe -c SWD -P %str% 0x8000000 -Rst -Run -NoPrompt
 
 rem: Using the open source texane-stlink instead of the proprietary STM stlink exe
-rem:texane-stlink\st-flash.exe write %str% 0x8000000
+rem:texane-stlink\st-flash.exe write %str% 0x8000000