Skip to content

Commit 8b851a0

Browse files
authored
Merge pull request #413 from armel/feature_update_v4
Feature update v4
2 parents b6782ec + e81fd73 commit 8b851a0

20 files changed

Lines changed: 715 additions & 50 deletions

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM --platform=amd64 archlinux:latest
1+
ARG BUILDPLATFORM
2+
FROM --platform=${BUILDPLATFORM} archlinux:latest
23
RUN pacman -Syyu base-devel --noconfirm
34
RUN pacman -Syyu arm-none-eabi-gcc --noconfirm
45
RUN pacman -Syyu arm-none-eabi-newlib --noconfirm

Makefile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ ENABLE_BYP_RAW_DEMODULATORS ?= 0
4141
ENABLE_BLMIN_TMP_OFF ?= 0
4242
ENABLE_SCAN_RANGES ?= 1
4343
ENABLE_FEAT_F4HWN ?= 1
44+
ENABLE_FEAT_F4HWN_GAME ?= 0
4445
ENABLE_FEAT_F4HWN_SCREENSHOT ?= 0
4546
ENABLE_FEAT_F4HWN_SPECTRUM ?= 1
4647
ENABLE_FEAT_F4HWN_RX_TX_TIMER ?= 1
@@ -153,6 +154,9 @@ OBJS += app/menu.o
153154
ifeq ($(ENABLE_SPECTRUM), 1)
154155
OBJS += app/spectrum.o
155156
endif
157+
ifeq ($(ENABLE_FEAT_F4HWN_GAME), 1)
158+
OBJS += app/breakout.o
159+
endif
156160
OBJS += app/scanner.o
157161
ifeq ($(ENABLE_UART),1)
158162
OBJS += app/uart.o
@@ -230,7 +234,7 @@ ifeq ($(ENABLE_FEAT_F4HWN),1)
230234
VERSION_STRING_1 ?= v0.22
231235

232236
AUTHOR_STRING_2 ?= F4HWN
233-
VERSION_STRING_2 ?= v4.0
237+
VERSION_STRING_2 ?= v4.1
234238

235239
EDITION_STRING ?= Custom
236240

@@ -430,6 +434,9 @@ ifeq ($(ENABLE_FEAT_F4HWN),1)
430434
else
431435
CFLAGS += -DSQL_TONE=550
432436
endif
437+
ifeq ($(ENABLE_FEAT_F4HWN_GAME),1)
438+
CFLAGS += -DENABLE_FEAT_F4HWN_GAME
439+
endif
433440
ifeq ($(ENABLE_FEAT_F4HWN_SCREENSHOT),1)
434441
CFLAGS += -DENABLE_FEAT_F4HWN_SCREENSHOT
435442
endif

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Anyway, have fun.
2626
2727
# Donations
2828

29-
Special thanks to Jean-Cyrille F6IWW (2 times), Fabrice 14RC123, David F4BPP, Olivier 14RC206, Frédéric F4ESO, Stéphane F5LGW, Jorge Ornelas (4 times), Laurent F4AXK, Christophe Morel, Clayton W0LED, Pierre Antoine F6FWB, Jean-Claude 14FRS3306, Thierry F4GVO, Eric F1NOU, PricelessToolkit, Ady M6NYJ, Tom McGovern (3 times), Joseph Roth, Pierre-Yves Colin, Frank DJ7FG, Marcel Testaz, Brian Frobisher, Yannick F4JFO, Paolo Bussola, Dirk DL8DF, Levente Szőke (2 times), Bernard-Michel Herrera, Jérôme Saintespes, Paul Davies, RS (3 times), Johan F4WAT, Robert Wörle, Rafael Sundorf, Paul Harker, Peter Fintl, Pascal F4ICR (2 times), Mike DL2MF, Eric KI1C (2 times), Phil G0ELM, Jérôme Lambert, Meinhard Frank Günther, Eliot Vedel, Alfonso EA7KDF, Jean-François F1EVM, Robert DC1RDB, Ian KE2CHJ and Daryl VK3AWA for their [donations](https://www.paypal.com/paypalme/F4HWN). That’s so kind of them. Thanks so much 🙏🏻
29+
Special thanks to Jean-Cyrille F6IWW (2 times), Fabrice 14RC123, David F4BPP, Olivier 14RC206, Frédéric F4ESO, Stéphane F5LGW, Jorge Ornelas (4 times), Laurent F4AXK, Christophe Morel, Clayton W0LED, Pierre Antoine F6FWB, Jean-Claude 14FRS3306, Thierry F4GVO, Eric F1NOU, PricelessToolkit, Ady M6NYJ, Tom McGovern (3 times), Joseph Roth, Pierre-Yves Colin, Frank DJ7FG, Marcel Testaz, Brian Frobisher, Yannick F4JFO, Paolo Bussola, Dirk DL8DF, Levente Szőke (2 times), Bernard-Michel Herrera, Jérôme Saintespes, Paul Davies, RS (3 times), Johan F4WAT, Robert Wörle, Rafael Sundorf, Paul Harker, Peter Fintl, Pascal F4ICR (2 times), Mike DL2MF, Eric KI1C (2 times), Phil G0ELM, Jérôme Lambert, Meinhard Frank Günther, Eliot Vedel, Alfonso EA7KDF, Jean-François F1EVM, Robert DC1RDB, Ian KE2CHJ, Daryl VK3AWA, Roberto Brunelli, Robert Boardman and Stephen Oliver for their [donations](https://www.paypal.com/paypalme/F4HWN). That’s so kind of them. Thanks so much 🙏🏻
3030

3131
## Table of Contents
3232

0 commit comments

Comments
 (0)