diff options
| -rw-r--r-- | micropeak/FTDI.tar.gz | bin | 251029 -> 0 bytes | |||
| -rw-r--r-- | micropeak/Makefile.am | 16 | ||||
| -rw-r--r-- | micropeak/ReadMe-Mac.rtf | 4 | ||||
| -rw-r--r-- | micropeak/micropeak-windows.nsi | 9 |
4 files changed, 24 insertions, 5 deletions
diff --git a/micropeak/FTDI.tar.gz b/micropeak/FTDI.tar.gz Binary files differdeleted file mode 100644 index cd08ecf2..00000000 --- a/micropeak/FTDI.tar.gz +++ /dev/null diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am index 4a7aaaa1..06eb3115 100644 --- a/micropeak/Makefile.am +++ b/micropeak/Makefile.am @@ -89,12 +89,22 @@ FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFR LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC) LINUX_EXTRA=micropeak-fat +MACOSX_DRIVER_URL=http://www.ftdichip.com/Drivers/VCP/MacOSX/FTDIUSBSerialDriver_v2_2_18.dmg +MACOSX_DRIVER=FTDIUSBSerialDriver_v2_2_18.dmg MACOSX_INFO_PLIST=Info.plist -MACOSX_DRIVER=FTDI.tar.gz MACOSX_README=ReadMe-Mac.rtf MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVER) $(MACOSX_README) -WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON) +$(MACOSX_DRIVER): + wget $(MACOSX_DRIVER_URL) + +WINDOWS_DRIVER_URL=http://www.ftdichip.com/Drivers/CDM/CDM20824_Setup.exe +WINDOWS_DRIVER=CDM20824_Setup.exe + +$(WINDOWS_DRIVER): + wget $(WINDOWS_DRIVER_URL) + +WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON) $(WINDOWS_DRIVER) if FATINSTALL @@ -219,7 +229,7 @@ $(MACOSX_DIST): $(MACOSX_FILES) cp -a MicroPeak.app macosx/ cp -a $(MACOSX_README) macosx/ReadMe.rtf cp -p Info.plist macosx/MicroPeak.app/Contents - tar xzf $(MACOSX_DRIVER) -C macosx + cp -p $(MACOSX_DRIVER) macosx mkdir -p macosx/MicroPeak.app/Contents/Resources/Java cp -p $(FATJAR) macosx/MicroPeak.app/Contents/Resources/Java/micropeak.jar cp -p libaltos.dylib macosx/MicroPeak.app/Contents/Resources/Java diff --git a/micropeak/ReadMe-Mac.rtf b/micropeak/ReadMe-Mac.rtf index 64bbdeb6..f831c3f9 100644 --- a/micropeak/ReadMe-Mac.rtf +++ b/micropeak/ReadMe-Mac.rtf @@ -14,6 +14,6 @@ There are two files included in the Mac OS X distribution:\ \ As with most Mac OS X applications, install MicroPeak by dragging it from the distribution disk image to a suitable place on your computer.\ \ -To communicate with the MicroPeak serial adapter, you need to installed the FTDI device drivers, which is done by double-clicking on the FTDIUSBSerialDriver package file. That will guide you through the installation process.\ +To communicate with the MicroPeak serial adapter, you need to installed the FTDI device drivers, which is done by double-clicking on the FTDIUSBSerialDriver disk image. Inside that is the FTDI USB Serial Driver package. Double click on that and it will guide you through the installation process.\ \ -Thanks for choosing AltusMetrum products!}
\ No newline at end of file +Thanks for choosing AltusMetrum products!} diff --git a/micropeak/micropeak-windows.nsi b/micropeak/micropeak-windows.nsi index 425048bd..4313ac28 100644 --- a/micropeak/micropeak-windows.nsi +++ b/micropeak/micropeak-windows.nsi @@ -80,6 +80,15 @@ Section "MicroPeak Application" CreateShortCut "$SMPROGRAMS\MicroPeak.lnk" "$SYSDIR\javaw.exe" "-jar micropeak-fat.jar" "$INSTDIR\micro-peak.ico" SectionEnd +Section "FTDI USB Driver" + SetOutPath $INSTDIR + + File "CDM20824_Setup.exe" + + StrCpy $2 "$INSTDIR\CDM20824_Setup.exe" + ExecWait $2 +SectionEnd + Section "MicroPeak Desktop Shortcut" CreateShortCut "$DESKTOP\MicroPeak.lnk" "$INSTDIR\micropeak-fat.jar" "" "$INSTDIR\micro-peak.ico" SectionEnd |