diff options
| author | Keith Packard <keithp@keithp.com> | 2017-08-11 23:45:25 -0400 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2017-08-11 23:45:25 -0400 |
| commit | 5fdce5b4a70ae59f8ac1ca10d9fadbbbd62412f3 (patch) | |
| tree | 2629e9b1359b774f26de60cb66d3bb504ac81791 /src | |
| parent | f1bbf1bd18d52a084af714a022b12bfc3c76374c (diff) | |
| parent | 2a3db28953f5cd981c519a917cdcd9f48dcb08e9 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 1 | ||||
| -rw-r--r-- | src/kernel/ao_log_fireone.c (renamed from src/kernel/ao_log_firetwo.c) | 0 | ||||
| -rw-r--r-- | src/telebt-v4.0/.gitignore | 3 | ||||
| -rw-r--r-- | src/telefireone-v1.0/Makefile | 10 | ||||
| -rw-r--r-- | src/telefireone-v1.0/ao_telefireone.c (renamed from src/telefireone-v1.0/ao_telefiretwo.c) | 0 |
5 files changed, 8 insertions, 6 deletions
diff --git a/src/Makefile b/src/Makefile index 4e5dac58..25e43a0e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -41,6 +41,7 @@ ARMM3DIRS=\ teledongle-v3.0 teledongle-v3.0/flash-loader \ teleballoon-v2.0 \ telebt-v3.0 telebt-v3.0/flash-loader \ + telebt-v4.0 telebt-v4.0/flash-loader \ telelcotwo-v0.1 telelcotwo-v0.1/flash-loader \ telefiretwo-v0.1 telefiretwo-v0.1/flash-loader \ diff --git a/src/kernel/ao_log_firetwo.c b/src/kernel/ao_log_fireone.c index 1a82673d..1a82673d 100644 --- a/src/kernel/ao_log_firetwo.c +++ b/src/kernel/ao_log_fireone.c diff --git a/src/telebt-v4.0/.gitignore b/src/telebt-v4.0/.gitignore index 892c3acc..d1cf2326 100644 --- a/src/telebt-v4.0/.gitignore +++ b/src/telebt-v4.0/.gitignore @@ -1,3 +1,4 @@ ao_product.h -ao_serial_lpc.h +*.bin +*.ihx *.elf diff --git a/src/telefireone-v1.0/Makefile b/src/telefireone-v1.0/Makefile index 87d5d477..53f088cb 100644 --- a/src/telefireone-v1.0/Makefile +++ b/src/telefireone-v1.0/Makefile @@ -55,18 +55,18 @@ ALTOS_SRC = \ ao_pad.c \ ao_radio_cmac_cmd.c \ ao_log.c \ - ao_log_firetwo.c + ao_log_fireone.c PRODUCT_SRC = \ - ao_telefiretwo.c + ao_telefireone.c -PRODUCT=TeleFireTwo-v1.0 -PRODUCT_DEF=-DTELEFIRETWO_V_1_0 +PRODUCT=TeleFireOne-v1.0 +PRODUCT_DEF=-DTELEFIREONE_V_1_0 IDPRODUCT=0x000f CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) -Os -g -PROGNAME = telefiretwo-v1.0 +PROGNAME = telefireone-v1.0 PROG = $(PROGNAME)-$(VERSION).elf HEX = $(PROGNAME)-$(VERSION).ihx diff --git a/src/telefireone-v1.0/ao_telefiretwo.c b/src/telefireone-v1.0/ao_telefireone.c index 115b3e91..115b3e91 100644 --- a/src/telefireone-v1.0/ao_telefiretwo.c +++ b/src/telefireone-v1.0/ao_telefireone.c |