From 2a6dff1855f0a9b6b8828d35769d20abb315d850 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Sat, 15 Jul 2017 16:47:19 -0400 Subject: [PATCH 1/3] Updating firmware date --- SerialPort.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SerialPort.cpp b/SerialPort.cpp index 9e4410c..5d8a49b 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -71,9 +71,9 @@ const uint8_t MMDVM_DEBUG4 = 0xF4U; const uint8_t MMDVM_DEBUG5 = 0xF5U; #if defined(ADF7021_N_VER) -#define DESCRIPTION "MMDVM_HS-ADF7021N 20170521 (D-Star/DMR/YSF/P25)" +#define DESCRIPTION "MMDVM_HS-ADF7021N 20170715 (DStar/DMR/YSF/P25)" #else -#define DESCRIPTION "MMDVM_HS-ADF7021 20170521 (D-Star/DMR/YSF/P25)" +#define DESCRIPTION "MMDVM_HS-ADF7021 20170715 (DStar/DMR/YSF/P25)" #endif #if defined(GITVERSION) From 3463eb03c98021c62c55545ef8bb36041cfffa76 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Sun, 16 Jul 2017 23:56:11 -0400 Subject: [PATCH 2/3] Adding Florian DF2ET fix Makefile and Windows compatibility --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index ea2b88e..cc90e84 100644 --- a/Makefile +++ b/Makefile @@ -235,11 +235,17 @@ endif # Export the current git version if the index file exists, else 000... GitVersion.h: .FORCE +ifdef SYSTEMROOT + echo #define GITVERSION "0000000" > $@ +else ifdef SystemRoot + echo #define GITVERSION "0000000" > $@ +else ifneq ("$(wildcard .git/index)","") echo "#define GITVERSION \"$(shell git rev-parse --short HEAD)\"" > $@ else echo "#define GITVERSION \"0000000\"" > $@ endif +endif .FORCE: From 19b652379647456e24557494479d17861448cbe4 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Sun, 16 Jul 2017 23:56:51 -0400 Subject: [PATCH 3/3] Adding Windows command line compilation instructions --- BUILD.md | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/BUILD.md b/BUILD.md index d48b813..a5409d5 100644 --- a/BUILD.md +++ b/BUILD.md @@ -133,7 +133,7 @@ Execute MMDVMHost: # ZUMspot Libre Kit -## Windows +## Windows with Arduino IDE Download and install the Arduino IDE: @@ -198,6 +198,66 @@ Once the transfer is completed, press the RESET button of the board or disconnec connect the USB cable. You will see the LED (PC13) of the blue pill blinking. Once you connect with MMDVMHost, the LED will blink fast. +## Windows with command line + +Download the source code (zip file) of MMDVM_HS from: + + https://github.com/juribeparada/MMDVM_HS + +Unzip MMDVM_HS-master.zip and change the folder name to "MMDVM_HS". The path name to this +folder can't have spaces. + +Download the ST libraries STM32F10X_Lib-master.zip from: + + https://github.com/juribeparada/STM32F10X_Lib/ + +Extract the STM32F10X_Lib-master folder into the same folder as the MMDVM_HS. Change the folder +name to "STM32F10X_Lib". + +Download the GNU make utility: + + http://gnuwin32.sourceforge.net/packages/make.htm + +Download the binaries zip file and extract make.exe and put it in the same directory MMDVM_HS. Download +the dependencies zip file and extract libintl3.dll and libiconv2.dll and put them in the same directory MMDVM_HS. + +Download the GNU ARM embedded toolchain from here: + + https://launchpad.net/gcc-arm-embedded/+download + +Currently the direct link to the installer is here: + + https://launchpad.net/gcc-arm-embedded/5.0/5-2016-q3-update/+download/gcc-arm-none-eabi-5_4-2016q3-20160926-win32.exe + +Download STM32duino (Arduino for STM32) from this URL (only for USB drivers): + + https://github.com/rogerclarkmelbourne/Arduino_STM32/tree/ZUMspot + +Unzip and copy Arduino_STM32-ZUMspot folder in (for example): + + C:\Arduino_STM32-ZUMspot + +Connect the ZUMspot Libre Kit to your PC. Install the USB Mapple driver using the bat file +(you may also check http://wiki.stm32duino.com/index.php?title=Windows_driver_installation): + + C:\Arduino_STM32-ZUMspot\drivers\win\install_drivers.bat + +Once the USB driver is installed, you may delete "C:\Arduino_STM32-ZUMspot" folder. + +Launch the "GCC Command Prompt" from "GNU Tools for ARM Embedded Processors" (Start Menu) and +cd to the folder where you put the MMDVM_HS folder. + +Edit Config.h according your preferences. The default Config.h is OK for ZUMSpot Libre Kit. + +Build the firmware: + + make clean + make bl + +Press the reset button of ZUMspot and upload the firmware: + + make dfu + ## Linux Raspbian Install the necessary software tools: