Skip to content

Commit 8b02e11

Browse files
author
Bricky
committed
misc: change compiler flags to save space, fix some code warnings
1 parent d076dae commit 8b02e11

File tree

8 files changed

+25
-23
lines changed

8 files changed

+25
-23
lines changed

Makefile

+10-12
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@ MOTO_STARTUP_TONE ?= 1
55
ENABLE_AM_FIX ?= 1
66
ENABLE_ALT_SQUELCH ?= 1
77
ENABLE_STATUS_BAR_LINE ?= 0
8-
ENABLE_NOAA ?= 1
8+
ENABLE_NOAA ?= 0
99
ENABLE_RX_BAR ?= 1
1010
ENABLE_TX_BAR ?= 1
1111
ENABLE_SLOWER_RSSI_TIMER ?= 1
12-
ENABLE_SPECTRUM ?= 1
13-
ENABLE_KEEP_MONITOR_MODE_UP_DN ?= 0
14-
PCB_VER_2_1 ?= 0
12+
ENABLE_SPECTRUM ?= 0
13+
ENABLE_KEEP_MONITOR_MODE_UP_DN ?= 1
14+
PCB_VER_2_1 ?= 1
1515

1616

1717
# Spectrum presets - 1.4 kB
18-
ENABLE_SPECTRUM_PRESETS ?= 1
18+
ENABLE_SPECTRUM_PRESETS ?= 0
1919
# FM radio = 2.6 kB
2020
ENABLE_FM_RADIO ?= 1
2121
# Register Editor = .5 kB
2222
ENABLE_REGISTER_EDIT ?= 0
2323
# Scanlist membership display - 252 B
24-
ENABLE_SCANLIST_DISPLAY ?= 1
24+
ENABLE_SCANLIST_DISPLAY ?= 0
2525
# Space saving options
26-
ENABLE_LTO ?= 0
26+
ENABLE_LTO ?= 1
2727
ENABLE_OPTIMIZED ?= 1
2828

2929

@@ -166,7 +166,8 @@ GIT_HASH := $(GIT_HASH_TMP)
166166
endif
167167

168168
ASFLAGS = -mcpu=cortex-m4
169-
CFLAGS = -Os -Wall -Werror -mcpu=cortex-m4 -fno-builtin -fshort-enums -fno-delete-null-pointer-checks -std=c2x -MMD
169+
CFLAGS = -Os -Wall -Werror -mcpu=cortex-m4 -pipe -free -freorder-blocks-algorithm=stc -std=c2x -MMD
170+
#CFLAGS += -Wextra
170171
CFLAGS += -DAT32F421C8T7
171172
CFLAGS += -DPRINTF_INCLUDE_CONFIG_H
172173
CFLAGS += -DGIT_HASH=\"$(GIT_HASH)\"
@@ -176,12 +177,9 @@ ifeq ($(ENABLE_OPTIMIZED),1)
176177
CFLAGS += --specs=nano.specs
177178
LDFLAGS += --specs=nano.specs
178179

180+
# Only takes effect when LTO is disabled
179181
CFLAGS += -ffunction-sections
180182
LDFLAGS += -Wl,--gc-sections
181-
182-
CFLAGS += -finline-limit=0
183-
184-
CFLAGS += -fmerge-all-constants
185183
endif
186184

187185
ifeq ($(DEBUG),1)

app/menu.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ void MENU_AcceptSetting(void)
601601
for (i = 0; i < 8; i++) {
602602
gSettingGolay = (gSettingGolay * 10) + (gInputBox[i] - '0');
603603
}
604-
if (gSettingGolay < 0x1000000) {
604+
if (gSettingGolay != 0) {
605605
return;
606606
}
607607
// Illegal code

app/radio.c

+3
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,9 @@ void RADIO_EndRX(void)
323323
switch (gExtendedSettings.ScanResume) {
324324
case 1: // Carrier Operated
325325
SCANNER_Countdown = 3000;
326+
// Implicit fallthrough
327+
gpio_bits_reset(GPIOA, BOARD_GPIOA_LED_GREEN);
328+
break;
326329
case 2: // Time Operated
327330
gpio_bits_reset(GPIOA, BOARD_GPIOA_LED_GREEN);
328331
break;

driver/pwm.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void PWM_Pulse(uint16_t Data)
4444

4545
tmr_para_init_ex1(&init);
4646
init.ch1_output_control_mode = TMR_OUTPUT_CONTROL_PWM_MODE_A;
47-
init.ch1_polarity = TMR_POLARITY_ACTIVE_HIGH;
47+
init.ch1_polarity = (tmr_output_polarity_type)TMR_POLARITY_ACTIVE_HIGH;
4848
init.ch1_enable = TRUE;
4949
init.ch1_digital_filter = Data;
5050
tmr_reset_ex1(TMR3, &init);

helper/dtmf.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ static void Init(void)
4343
};
4444

4545

46-
for (int i = 0; i < ARRAY_SIZE(init_0x9_values); i++) {
46+
for (unsigned int i = 0; i < ARRAY_SIZE(init_0x9_values); i++) {
4747
BK4819_WriteRegister(0x09, init_0x9_values[i]);
4848
}
4949

ui/font.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ static uint8_t LoadAndDraw(uint8_t X, uint8_t Y, uint32_t Offset)
6464
}
6565
}
6666

67-
void FONT_Draw(uint8_t X, uint8_t Y, const uint32_t *pOffsets, uint32_t Count)
67+
void FONT_Draw(uint8_t X, uint8_t Y, uint32_t Count)
6868
{
6969
uint8_t i, x;
7070

ui/font.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <stdbool.h>
2121
#include <stdint.h>
2222

23-
void FONT_Draw(uint8_t X, uint8_t Y, const uint32_t *pOffsets, uint32_t Count);
23+
void FONT_Draw(uint8_t X, uint8_t Y, uint32_t Count);
2424
uint8_t FONT_GetOffsets(const char *String, uint8_t Size, bool bFlag);
2525

2626
#endif

ui/helper.c

+7-6
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ static const uint8_t BitmapRadar[] = {
226226

227227
void UI_DrawString(uint8_t X, uint8_t Y, const char *pString, uint8_t Size)
228228
{
229-
FONT_Draw(X, Y, SFLASH_FontOffsets, FONT_GetOffsets(pString, Size, true));
229+
FONT_Draw(X, Y, FONT_GetOffsets(pString, Size, true));
230230
}
231231

232232
void UI_DrawSmallCharacter(uint8_t X, uint8_t Y, char Digit)
@@ -714,7 +714,7 @@ void UI_DrawDTMF(void)
714714

715715
void UI_DrawFMFrequency(uint16_t Frequency)
716716
{
717-
Int2Ascii(gSettings.FmFrequency, 4);
717+
Int2Ascii(Frequency, 4);
718718
gShortString[4] = gShortString[3];
719719
gShortString[3] = '.';
720720
gColorForeground = COLOR_BLUE;
@@ -963,11 +963,12 @@ void UI_DrawGolay(void)
963963
for (i = 0; i < 8; i++) {
964964
gSettingGolay = (gSettingGolay * 10) + (gInputBox[i] - '0');
965965
}
966-
if (gSettingGolay > 0xFFFFFF) {
967-
gSettingGolay &= 0xFFFFFF;
968-
Int2Ascii(gSettingGolay, 8);
969-
UI_DrawString(24, 24, gShortString, 8);
966+
if (gSettingGolay != 0) {
967+
return;
970968
}
969+
gSettingGolay &= 0xFFFFFF;
970+
Int2Ascii(gSettingGolay, 8);
971+
UI_DrawString(24, 24, gShortString, 8);
971972
}
972973

973974
void UI_DrawChannelNumber(const char *pString)

0 commit comments

Comments
 (0)