diff options
| author | Bdale Garbee <bdale@gag.com> | 2018-03-18 15:47:31 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2018-03-18 15:47:31 -0600 |
| commit | 7b614380f307cb5e27f2a05281bc76c4ace93334 (patch) | |
| tree | d243b069a134233f4b98e35769193a1244fc57f8 /altosui | |
| parent | 16a9d8617b2d2092d166a85ada4349601afb0dce (diff) | |
| parent | 39023ed6e29103a85bfad505506fa0dbf4dc1112 (diff) | |
Merge branch 'master' into branch-1.8
Diffstat (limited to 'altosui')
| -rw-r--r-- | altosui/Makefile.am | 3 | ||||
| -rw-r--r-- | altosui/altos-windows.nsi.in | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/altosui/Makefile.am b/altosui/Makefile.am index 6f206c3d..805c5550 100644 --- a/altosui/Makefile.am +++ b/altosui/Makefile.am @@ -150,7 +150,8 @@ FIRMWARE_EMEGA_1_0=$(top_srcdir)/src/easymega-v1.0/easymega-v1.0-$(VERSION).ihx FIRMWARE_EMEGA=$(FIRMWARE_EMEGA_1_0) FIRMWARE_TGPS_1_0=$(top_srcdir)/src/telegps-v1.0/telegps-v1.0-$(VERSION).ihx -FIRMWARE_TGPS=$(FIRMWARE_TGPS_1_0) +FIRMWARE_TGPS_2_0=$(top_srcdir)/src/telegps-v2.0/telegps-v2.0-$(VERSION).ihx +FIRMWARE_TGPS=$(FIRMWARE_TGPS_1_0) $(FIRMWARE_TGPS_2_0) FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD) $(FIRMWARE_TBT) $(FIRMWARE_TMEGA) $(FIRMWARE_EMINI) $(FIRMWARE_TGPS) $(FIRMWARE_EMEGA) diff --git a/altosui/altos-windows.nsi.in b/altosui/altos-windows.nsi.in index 31139513..23d6f6bd 100644 --- a/altosui/altos-windows.nsi.in +++ b/altosui/altos-windows.nsi.in @@ -128,6 +128,7 @@ Section "Firmware" 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/telegps-v2.0/telegps-v2.0-${VERSION}.ihx" File "../src/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx" File "../src/teledongle-v3.0/teledongle-v3.0-${VERSION}.ihx" File "../src/telebt-v1.0/telebt-v1.0-${VERSION}.ihx" |