diff options
| -rw-r--r-- | altosui/Makefile.am | 7 | ||||
| -rw-r--r-- | altosui/altos-windows.nsi.in | 2 | ||||
| -rwxr-xr-x | telemetrum.inf | 35 | 
3 files changed, 33 insertions, 11 deletions
| diff --git a/altosui/Makefile.am b/altosui/Makefile.am index f11c3bfa..0b75a2b1 100644 --- a/altosui/Makefile.am +++ b/altosui/Makefile.am @@ -152,7 +152,9 @@ FIRMWARE_TBT=$(FIRMWARE_TBT_1_0)  FIRMWARE_TMEGA_1_0=$(top_srcdir)/src/telemega-v1.0/telemega-v1.0-$(VERSION).ihx  FIRMWARE_TMEGA=$(FIRMWARE_TMEGA_1_0) -FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD) $(FIRMWARE_TBT) $(FIRMWARE_TMEGA) +FIRMWARE_EMINI_1_0=$(top_srcdir)/src/easymini-v1.0/easymini-v1.0-$(VERSION).ihx + +FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD) $(FIRMWARE_TBT) $(FIRMWARE_TMEGA) $(FIRMWARE_EMINI)  ALTUSMETRUM_DOC=$(top_srcdir)/doc/altusmetrum.pdf  ALTOS_DOC=$(top_srcdir)/doc/altos.pdf @@ -160,7 +162,8 @@ TELEMETRY_DOC=$(top_srcdir)/doc/telemetry.pdf  TEMPLATE_DOC=\  	$(top_srcdir)/doc/telemetrum-outline.pdf \  	$(top_srcdir)/doc/easymini-outline.pdf \ -	$(top_srcdir)/doc/telemega-outline.pdf +	$(top_srcdir)/doc/telemega-outline.pdf \ +	$(top_srcdir)/doc/easymini-outline.pdf  DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TELEMETRY_DOC) $(TEMPLATE_DOC) diff --git a/altosui/altos-windows.nsi.in b/altosui/altos-windows.nsi.in index 443799d6..779b0c12 100644 --- a/altosui/altos-windows.nsi.in +++ b/altosui/altos-windows.nsi.in @@ -122,6 +122,7 @@ Section "TeleMetrum, TeleDongle and TeleBT Firmware"  	File "../src/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx"  	File "../src/telebt-v1.0/telebt-v1.0-${VERSION}.ihx"  	File "../src/telemega-v1.0/telemega-v1.0-${VERSION}.ihx" +	File "../src/easymini-v1.0/easymini-v1.0-${VERSION}.ihx"  SectionEnd @@ -134,6 +135,7 @@ Section "Documentation"  	File "../doc/telemetry.pdf"  	File "../doc/telemetrum-outline.pdf"  	File "../doc/telemega-outline.pdf" +	File "../doc/easymini-outline.pdf"  SectionEnd  Section "Uninstaller" diff --git a/telemetrum.inf b/telemetrum.inf index 386dd286..220069b3 100755 --- a/telemetrum.inf +++ b/telemetrum.inf @@ -33,8 +33,8 @@ DefaultDestDir	= 12  %TeleMega%	= AltusMetrum.Install, USB\VID_FFFE&PID_0023, AltusMetrumSerial
  %MegaDongle	= AltusMetrum.Install, USB\VID_FFFE&PID_0024, AltusMetrumSerial
  %TeleGPS%	= AltusMetrum.Install, USB\VID_FFFE&PID_0025, AltusMetrumSerial
 -%AltusMetrum26%	= AltusMetrum.Install, USB\VID_FFFE&PID_0026, AltusMetrumSerial
 -%AltusMetrum27%	= AltusMetrum.Install, USB\VID_FFFE&PID_0027, AltusMetrumSerial
 +%EasyMini%	= AltusMetrum.Install, USB\VID_FFFE&PID_0026, AltusMetrumSerial
 +%TeleMini%	= AltusMetrum.Install, USB\VID_FFFE&PID_0027, AltusMetrumSerial
  %AltusMetrum28%	= AltusMetrum.Install, USB\VID_FFFE&PID_0028, AltusMetrumSerial
  %AltusMetrum29%	= AltusMetrum.Install, USB\VID_FFFE&PID_0029, AltusMetrumSerial
  %AltusMetrum2a%	= AltusMetrum.Install, USB\VID_FFFE&PID_002a, AltusMetrumSerial
 @@ -55,8 +55,8 @@ DefaultDestDir	= 12  %TeleMega%	= AltusMetrum.Install, USB\VID_FFFE&PID_0023, AltusMetrumSerial
  %MegaDongle	= AltusMetrum.Install, USB\VID_FFFE&PID_0024, AltusMetrumSerial
  %TeleGPS%	= AltusMetrum.Install, USB\VID_FFFE&PID_0025, AltusMetrumSerial
 -%AltusMetrum26%	= AltusMetrum.Install, USB\VID_FFFE&PID_0026, AltusMetrumSerial
 -%AltusMetrum27%	= AltusMetrum.Install, USB\VID_FFFE&PID_0027, AltusMetrumSerial
 +%EasyMini%	= AltusMetrum.Install, USB\VID_FFFE&PID_0026, AltusMetrumSerial
 +%TeleMini%	= AltusMetrum.Install, USB\VID_FFFE&PID_0027, AltusMetrumSerial
  %AltusMetrum28%	= AltusMetrum.Install, USB\VID_FFFE&PID_0028, AltusMetrumSerial
  %AltusMetrum29%	= AltusMetrum.Install, USB\VID_FFFE&PID_0029, AltusMetrumSerial
  %AltusMetrum2a%	= AltusMetrum.Install, USB\VID_FFFE&PID_002a, AltusMetrumSerial
 @@ -77,8 +77,8 @@ DefaultDestDir	= 12  %TeleMega%	= AltusMetrum.Install, USB\VID_FFFE&PID_0023, AltusMetrumSerial
  %MegaDongle	= AltusMetrum.Install, USB\VID_FFFE&PID_0024, AltusMetrumSerial
  %TeleGPS%	= AltusMetrum.Install, USB\VID_FFFE&PID_0025, AltusMetrumSerial
 -%AltusMetrum26%	= AltusMetrum.Install, USB\VID_FFFE&PID_0026, AltusMetrumSerial
 -%AltusMetrum27%	= AltusMetrum.Install, USB\VID_FFFE&PID_0027, AltusMetrumSerial
 +%EasyMini%	= AltusMetrum.Install, USB\VID_FFFE&PID_0026, AltusMetrumSerial
 +%TeleMini%	= AltusMetrum.Install, USB\VID_FFFE&PID_0027, AltusMetrumSerial
  %AltusMetrum28%	= AltusMetrum.Install, USB\VID_FFFE&PID_0028, AltusMetrumSerial
  %AltusMetrum29%	= AltusMetrum.Install, USB\VID_FFFE&PID_0029, AltusMetrumSerial
  %AltusMetrum2a%	= AltusMetrum.Install, USB\VID_FFFE&PID_002a, AltusMetrumSerial
 @@ -99,8 +99,8 @@ DefaultDestDir	= 12  %TeleMega%	= AltusMetrum.Install, USB\VID_FFFE&PID_0023, AltusMetrumSerial
  %MegaDongle	= AltusMetrum.Install, USB\VID_FFFE&PID_0024, AltusMetrumSerial
  %TeleGPS%	= AltusMetrum.Install, USB\VID_FFFE&PID_0025, AltusMetrumSerial
 -%AltusMetrum26%	= AltusMetrum.Install, USB\VID_FFFE&PID_0026, AltusMetrumSerial
 -%AltusMetrum27%	= AltusMetrum.Install, USB\VID_FFFE&PID_0027, AltusMetrumSerial
 +%EasyMini%	= AltusMetrum.Install, USB\VID_FFFE&PID_0026, AltusMetrumSerial
 +%TeleMini%	= AltusMetrum.Install, USB\VID_FFFE&PID_0027, AltusMetrumSerial
  %AltusMetrum28%	= AltusMetrum.Install, USB\VID_FFFE&PID_0028, AltusMetrumSerial
  %AltusMetrum29%	= AltusMetrum.Install, USB\VID_FFFE&PID_0029, AltusMetrumSerial
  %AltusMetrum2a%	= AltusMetrum.Install, USB\VID_FFFE&PID_002a, AltusMetrumSerial
 @@ -140,7 +140,7 @@ HKR,,DeviceType, 1,		01  HKR,, Properties, 1, C0,01,00,00, 00,00,00,00, FF,00,00,00, 07,00,00,00, 0F,00,00,00, F7,0F,00,00, 00,84,03,00, C0,DA,00,00
  [Uninstall.AddReg]
 -HKLM,Software\Microsoft\Windows\CurrentVersion\Uninstall\%TeleMetrum%,DisplayName,,"%TeleMetrum%"
 +HKLM,Software\Microsoft\Windows\CurrentVersion\Uninstall\%AltusMetrum%,DisplayName,,"%AltusMetrum%"
  [Strings]
  Mfg		= "altusmetrum.org"
 @@ -148,5 +148,22 @@ AltusMetrum	= "AltusMetrum"  TeleMetrum	= "TeleMetrum"
  TeleDongle	= "TeleDongle"
  TeleTerra	= "TeleTerra"
 +TeleBT		= "TeleBT"
 +TeleLaunch	= "TeleLaunch"
 +TeleLCO		= "TeleLCO"
 +TeleScience	= "TeleScience"
 +TelePyro	= "TelePyro"
 +TeleShield	= "TeleShield"
 +TeleMega	= "TeleMega"
 +MegaDongle	= "MegaDongle"
 +TeleGPS		= "TeleGPS"
 +EasyMini	= "EasyMini"
 +TeleMini	= "TeleMini"
 +AltusMetrum28	= "AltusMetrum28"
 +AltusMetrum29	= "AltusMetrum29"
 +AltusMetrum2a	= "AltusMetrum2a"
 +AltusMetrum2b	= "AltusMetrum2b"
 +AltusMetrum2c	= "AltusMetrum2c"
 +
  DriverName	= "Altus Metrum Device Driver"
 | 
