diff options
| author | Bdale Garbee <bdale@gag.com> | 2017-04-25 22:04:22 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2017-04-25 22:04:22 -0600 |
| commit | 30e6e087b639c6d7ec75f21ba8c6fcf6ad50fffe (patch) | |
| tree | d37b155767f832ca7a64e838a6f8a6a5ef492448 /altosui | |
| parent | b2a5118dededd1ed6b1326e82168214cb0b24821 (diff) | |
| parent | 75881968ffb6bfd4e920cac4aa15d8d188eda119 (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'altosui')
| -rw-r--r-- | altosui/Makefile.am | 3 | ||||
| -rw-r--r-- | altosui/altos-windows.nsi.in | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/altosui/Makefile.am b/altosui/Makefile.am index de3dee68..df022c40 100644 --- a/altosui/Makefile.am +++ b/altosui/Makefile.am @@ -131,7 +131,8 @@ FIRMWARE_TM_2_0=$(top_srcdir)/src/telemetrum-v2.0/telemetrum-v2.0-$(VERSION).ihx FIRMWARE_TM=$(FIRMWARE_TM_1_0) $(FIRMWARE_TM_1_1) $(FIRMWARE_TM_1_2) $(FIRMWARE_TM_2_0) FIRMWARE_TELEMINI_1_0=$(top_srcdir)/src/telemini-v1.0/telemini-v1.0-$(VERSION).ihx -FIRMWARE_TELEMINI=$(FIRMWARE_TELEMINI_1_0) +FIRMWARE_TELEMINI_3_0=$(top_srcdir)/src/telemini-v3.0/telemini-v3.0-$(VERSION).ihx +FIRMWARE_TELEMINI=$(FIRMWARE_TELEMINI_1_0) $(FIRMWARE_TELEMINI_3_0) FIRMWARE_TBT_1_0=$(top_srcdir)/src/telebt-v1.0/telebt-v1.0-$(VERSION).ihx FIRMWARE_TBT_3_0=$(top_srcdir)/src/telebt-v3.0/telebt-v3.0-$(VERSION).ihx diff --git a/altosui/altos-windows.nsi.in b/altosui/altos-windows.nsi.in index 1039bd41..ce1a2d6c 100644 --- a/altosui/altos-windows.nsi.in +++ b/altosui/altos-windows.nsi.in @@ -126,6 +126,7 @@ Section "Firmware" File "../src/telemetrum-v2.0/telemetrum-v2.0-${VERSION}.ihx" ; File "../src/telemetrum-v3.0/telemetrum-v3.0-${VERSION}.ihx" File "../src/telemini-v1.0/telemini-v1.0-${VERSION}.ihx" + File "../src/telemini-v3.0/telemini-v3.0-${VERSION}.ihx" File "../src/telegps-v1.0/telegps-v1.0-${VERSION}.ihx" File "../src/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx" File "../src/teledongle-v3.0/teledongle-v3.0-${VERSION}.ihx" @@ -134,6 +135,7 @@ Section "Firmware" File "../src/telemega-v1.0/telemega-v1.0-${VERSION}.ihx" File "../src/telemega-v2.0/telemega-v2.0-${VERSION}.ihx" File "../src/easymini-v1.0/easymini-v1.0-${VERSION}.ihx" + File "../src/easymini-v2.0/easymini-v2.0-${VERSION}.ihx" File "../src/easymega-v1.0/easymega-v1.0-${VERSION}.ihx" SectionEnd |