altosui: Add EasyMini bits to fat distribution images. Update telemetrum.inf

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index f11c3bfaf7f451425a2907b1548d1d4fa79951a7..0b75a2b166562ec9c85d541f5881b65d3e23a7c9 100644 (file)
--- 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_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
 
 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 \
 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)
 
 
 DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TELEMETRY_DOC) $(TEMPLATE_DOC)
 

diff --git a/altosui/altos-windows.nsi.in b/altosui/altos-windows.nsi.in
index 443799d6b10a01c64a4ab54aaada762ed155dc04..779b0c1279cf6c1b98daa4c6d69393e66bf9e26f 100644 (file)
--- 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/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
 
 
 SectionEnd
 


@@ -134,6 +135,7 @@ Section "Documentation"
        File "../doc/telemetry.pdf"
        File "../doc/telemetrum-outline.pdf"
        File "../doc/telemega-outline.pdf"
        File "../doc/telemetry.pdf"
        File "../doc/telemetrum-outline.pdf"
        File "../doc/telemega-outline.pdf"

+       File "../doc/easymini-outline.pdf"

 SectionEnd
 
 Section "Uninstaller"
 SectionEnd
 
 Section "Uninstaller"

diff --git a/telemetrum.inf b/telemetrum.inf
index 386dd2869ef1e12f688cb35aa9c27845854e2490..220069b3c3f16a9f575bc9292faf5f715258bec4 100755 (executable)
--- a/telemetrum.inf
+++ b/telemetrum.inf
@@ -33,8 +33,8 @@ DefaultDestDir        = 12
 %TeleMega%     = AltusMetrum.Install, USB\VID_FFFE&PID_0023, AltusMetrumSerial\r
 %MegaDongle    = AltusMetrum.Install, USB\VID_FFFE&PID_0024, AltusMetrumSerial\r
 %TeleGPS%      = AltusMetrum.Install, USB\VID_FFFE&PID_0025, AltusMetrumSerial\r
 %TeleMega%     = AltusMetrum.Install, USB\VID_FFFE&PID_0023, AltusMetrumSerial\r
 %MegaDongle    = AltusMetrum.Install, USB\VID_FFFE&PID_0024, AltusMetrumSerial\r
 %TeleGPS%      = AltusMetrum.Install, USB\VID_FFFE&PID_0025, AltusMetrumSerial\r

-%AltusMetrum26%        = AltusMetrum.Install, USB\VID_FFFE&PID_0026, AltusMetrumSerial\r
-%AltusMetrum27%        = AltusMetrum.Install, USB\VID_FFFE&PID_0027, AltusMetrumSerial\r
+%EasyMini%     = AltusMetrum.Install, USB\VID_FFFE&PID_0026, AltusMetrumSerial\r
+%TeleMini%     = AltusMetrum.Install, USB\VID_FFFE&PID_0027, AltusMetrumSerial\r

 %AltusMetrum28%        = AltusMetrum.Install, USB\VID_FFFE&PID_0028, AltusMetrumSerial\r
 %AltusMetrum29%        = AltusMetrum.Install, USB\VID_FFFE&PID_0029, AltusMetrumSerial\r
 %AltusMetrum2a%        = AltusMetrum.Install, USB\VID_FFFE&PID_002a, AltusMetrumSerial\r
 %AltusMetrum28%        = AltusMetrum.Install, USB\VID_FFFE&PID_0028, AltusMetrumSerial\r
 %AltusMetrum29%        = AltusMetrum.Install, USB\VID_FFFE&PID_0029, AltusMetrumSerial\r
 %AltusMetrum2a%        = AltusMetrum.Install, USB\VID_FFFE&PID_002a, AltusMetrumSerial\r


@@ -55,8 +55,8 @@ DefaultDestDir        = 12
 %TeleMega%     = AltusMetrum.Install, USB\VID_FFFE&PID_0023, AltusMetrumSerial\r
 %MegaDongle    = AltusMetrum.Install, USB\VID_FFFE&PID_0024, AltusMetrumSerial\r
 %TeleGPS%      = AltusMetrum.Install, USB\VID_FFFE&PID_0025, AltusMetrumSerial\r
 %TeleMega%     = AltusMetrum.Install, USB\VID_FFFE&PID_0023, AltusMetrumSerial\r
 %MegaDongle    = AltusMetrum.Install, USB\VID_FFFE&PID_0024, AltusMetrumSerial\r
 %TeleGPS%      = AltusMetrum.Install, USB\VID_FFFE&PID_0025, AltusMetrumSerial\r

-%AltusMetrum26%        = AltusMetrum.Install, USB\VID_FFFE&PID_0026, AltusMetrumSerial\r
-%AltusMetrum27%        = AltusMetrum.Install, USB\VID_FFFE&PID_0027, AltusMetrumSerial\r
+%EasyMini%     = AltusMetrum.Install, USB\VID_FFFE&PID_0026, AltusMetrumSerial\r
+%TeleMini%     = AltusMetrum.Install, USB\VID_FFFE&PID_0027, AltusMetrumSerial\r

 %AltusMetrum28%        = AltusMetrum.Install, USB\VID_FFFE&PID_0028, AltusMetrumSerial\r
 %AltusMetrum29%        = AltusMetrum.Install, USB\VID_FFFE&PID_0029, AltusMetrumSerial\r
 %AltusMetrum2a%        = AltusMetrum.Install, USB\VID_FFFE&PID_002a, AltusMetrumSerial\r
 %AltusMetrum28%        = AltusMetrum.Install, USB\VID_FFFE&PID_0028, AltusMetrumSerial\r
 %AltusMetrum29%        = AltusMetrum.Install, USB\VID_FFFE&PID_0029, AltusMetrumSerial\r
 %AltusMetrum2a%        = AltusMetrum.Install, USB\VID_FFFE&PID_002a, AltusMetrumSerial\r


@@ -77,8 +77,8 @@ DefaultDestDir        = 12
 %TeleMega%     = AltusMetrum.Install, USB\VID_FFFE&PID_0023, AltusMetrumSerial\r
 %MegaDongle    = AltusMetrum.Install, USB\VID_FFFE&PID_0024, AltusMetrumSerial\r
 %TeleGPS%      = AltusMetrum.Install, USB\VID_FFFE&PID_0025, AltusMetrumSerial\r
 %TeleMega%     = AltusMetrum.Install, USB\VID_FFFE&PID_0023, AltusMetrumSerial\r
 %MegaDongle    = AltusMetrum.Install, USB\VID_FFFE&PID_0024, AltusMetrumSerial\r
 %TeleGPS%      = AltusMetrum.Install, USB\VID_FFFE&PID_0025, AltusMetrumSerial\r

-%AltusMetrum26%        = AltusMetrum.Install, USB\VID_FFFE&PID_0026, AltusMetrumSerial\r
-%AltusMetrum27%        = AltusMetrum.Install, USB\VID_FFFE&PID_0027, AltusMetrumSerial\r
+%EasyMini%     = AltusMetrum.Install, USB\VID_FFFE&PID_0026, AltusMetrumSerial\r
+%TeleMini%     = AltusMetrum.Install, USB\VID_FFFE&PID_0027, AltusMetrumSerial\r

 %AltusMetrum28%        = AltusMetrum.Install, USB\VID_FFFE&PID_0028, AltusMetrumSerial\r
 %AltusMetrum29%        = AltusMetrum.Install, USB\VID_FFFE&PID_0029, AltusMetrumSerial\r
 %AltusMetrum2a%        = AltusMetrum.Install, USB\VID_FFFE&PID_002a, AltusMetrumSerial\r
 %AltusMetrum28%        = AltusMetrum.Install, USB\VID_FFFE&PID_0028, AltusMetrumSerial\r
 %AltusMetrum29%        = AltusMetrum.Install, USB\VID_FFFE&PID_0029, AltusMetrumSerial\r
 %AltusMetrum2a%        = AltusMetrum.Install, USB\VID_FFFE&PID_002a, AltusMetrumSerial\r


@@ -99,8 +99,8 @@ DefaultDestDir        = 12
 %TeleMega%     = AltusMetrum.Install, USB\VID_FFFE&PID_0023, AltusMetrumSerial\r
 %MegaDongle    = AltusMetrum.Install, USB\VID_FFFE&PID_0024, AltusMetrumSerial\r
 %TeleGPS%      = AltusMetrum.Install, USB\VID_FFFE&PID_0025, AltusMetrumSerial\r
 %TeleMega%     = AltusMetrum.Install, USB\VID_FFFE&PID_0023, AltusMetrumSerial\r
 %MegaDongle    = AltusMetrum.Install, USB\VID_FFFE&PID_0024, AltusMetrumSerial\r
 %TeleGPS%      = AltusMetrum.Install, USB\VID_FFFE&PID_0025, AltusMetrumSerial\r

-%AltusMetrum26%        = AltusMetrum.Install, USB\VID_FFFE&PID_0026, AltusMetrumSerial\r
-%AltusMetrum27%        = AltusMetrum.Install, USB\VID_FFFE&PID_0027, AltusMetrumSerial\r
+%EasyMini%     = AltusMetrum.Install, USB\VID_FFFE&PID_0026, AltusMetrumSerial\r
+%TeleMini%     = AltusMetrum.Install, USB\VID_FFFE&PID_0027, AltusMetrumSerial\r

 %AltusMetrum28%        = AltusMetrum.Install, USB\VID_FFFE&PID_0028, AltusMetrumSerial\r
 %AltusMetrum29%        = AltusMetrum.Install, USB\VID_FFFE&PID_0029, AltusMetrumSerial\r
 %AltusMetrum2a%        = AltusMetrum.Install, USB\VID_FFFE&PID_002a, AltusMetrumSerial\r
 %AltusMetrum28%        = AltusMetrum.Install, USB\VID_FFFE&PID_0028, AltusMetrumSerial\r
 %AltusMetrum29%        = AltusMetrum.Install, USB\VID_FFFE&PID_0029, AltusMetrumSerial\r
 %AltusMetrum2a%        = AltusMetrum.Install, USB\VID_FFFE&PID_002a, AltusMetrumSerial\r


@@ -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\r
 \r
 [Uninstall.AddReg]\r
 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\r
 \r
 [Uninstall.AddReg]\r

-HKLM,Software\Microsoft\Windows\CurrentVersion\Uninstall\%TeleMetrum%,DisplayName,,"%TeleMetrum%"\r
+HKLM,Software\Microsoft\Windows\CurrentVersion\Uninstall\%AltusMetrum%,DisplayName,,"%AltusMetrum%"\r

 \r
 [Strings]\r
 Mfg            = "altusmetrum.org"\r
 \r
 [Strings]\r
 Mfg            = "altusmetrum.org"\r


@@ -148,5 +148,22 @@ AltusMetrum        = "AltusMetrum"
 TeleMetrum     = "TeleMetrum"\r
 TeleDongle     = "TeleDongle"\r
 TeleTerra      = "TeleTerra"\r
 TeleMetrum     = "TeleMetrum"\r
 TeleDongle     = "TeleDongle"\r
 TeleTerra      = "TeleTerra"\r

+TeleBT         = "TeleBT"\r
+TeleLaunch     = "TeleLaunch"\r
+TeleLCO                = "TeleLCO"\r
+TeleScience    = "TeleScience"\r
+TelePyro       = "TelePyro"\r
+TeleShield     = "TeleShield"\r
+TeleMega       = "TeleMega"\r
+MegaDongle     = "MegaDongle"\r
+TeleGPS                = "TeleGPS"\r
+EasyMini       = "EasyMini"\r
+TeleMini       = "TeleMini"\r
+AltusMetrum28  = "AltusMetrum28"\r
+AltusMetrum29  = "AltusMetrum29"\r
+AltusMetrum2a  = "AltusMetrum2a"\r
+AltusMetrum2b  = "AltusMetrum2b"\r
+AltusMetrum2c  = "AltusMetrum2c"\r
+\r

 DriverName     = "Altus Metrum Device Driver"\r
 \r
 DriverName     = "Altus Metrum Device Driver"\r
 \r