Cleanup & Mask unused functions

This commit is contained in:
Ben V. Brown
2020-11-01 12:24:24 +11:00
parent bc4910a8c7
commit 7c5c689d44
3 changed files with 6 additions and 11 deletions

View File

@@ -629,7 +629,7 @@ uint16_t adc_inserted_data_read(uint32_t adc_periph, uint8_t inserted_channel)
idata = 0U; idata = 0U;
break; break;
} }
return (uint16_t)idata; return (uint16_t)idata& 0xFFFF;
} }
/*! /*!

View File

@@ -68,9 +68,10 @@ static void settings_displayTempChangeLongStep(void);
static bool settings_setTempChangeLongStep(void); static bool settings_setTempChangeLongStep(void);
static void settings_displayPowerPulse(void); static void settings_displayPowerPulse(void);
static bool settings_setPowerPulse(void); static bool settings_setPowerPulse(void);
#ifdef HALL_SENSOR
static void settings_displayHallEffect(void); static void settings_displayHallEffect(void);
static bool settings_setHallEffect(void); static bool settings_setHallEffect(void);
#endif
// Menu functions // Menu functions
static void settings_displaySolderingMenu(void); static void settings_displaySolderingMenu(void);
static bool settings_enterSolderingMenu(void); static bool settings_enterSolderingMenu(void);
@@ -828,7 +829,7 @@ static void settings_displayPowerPulse(void) {
} }
} }
#ifdef HALL_SENSOR
static void settings_displayHallEffect(void) { static void settings_displayHallEffect(void) {
printShortDescription(26, 7); printShortDescription(26, 7);
switch (systemSettings.hallEffectSensitivity) { switch (systemSettings.hallEffectSensitivity) {
@@ -852,10 +853,9 @@ static bool settings_setHallEffect(void) {
// Off, Low, Medium, High // Off, Low, Medium, High
systemSettings.hallEffectSensitivity++; systemSettings.hallEffectSensitivity++;
systemSettings.hallEffectSensitivity %= 4; systemSettings.hallEffectSensitivity %= 4;
return systemSettings.hallEffectSensitivity == 3; return systemSettings.hallEffectSensitivity == 3;
} }
#endif
static void displayMenu(size_t index) { static void displayMenu(size_t index) {
// Call into the menu // Call into the menu
OLED::setFont(1); OLED::setFont(1);

View File

@@ -70,7 +70,7 @@ S_SRCS := $(shell find $(PINE_INC_DIR) -type f -name '*.S')
ASM_INC = -I$(PINE_RISCV_INC_DIR) ASM_INC = -I$(PINE_RISCV_INC_DIR)
LDSCRIPT=GD32VF103xB.ld LDSCRIPT=GD32VF103xB.ld
DEV_LDFLAGS=-nostartfiles -Xlinker --gc-sections DEV_LDFLAGS=-nostartfiles -Xlinker --gc-sections
DEV_GLOBAL_DEFS=-msmall-data-limit=8 -mno-save-restore -Os -fmessage-length=0 -fsigned-char -fabi-version=0 DEV_GLOBAL_DEFS=-msmall-data-limit=8 -mno-save-restore -Os -fmessage-length=0 -fabi-version=0
DEV_CFLAGS= -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" DEV_CFLAGS= -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)"
DEV_CXXFLAGS= -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" DEV_CXXFLAGS= -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)"
flash_size=128k flash_size=128k
@@ -173,10 +173,7 @@ LINKER_FLAGS=$(CPUFLAGS) \
-fno-rtti \ -fno-rtti \
-fno-exceptions \ -fno-exceptions \
-fno-non-call-exceptions \ -fno-non-call-exceptions \
-fno-use-cxa-atexit \
-fno-strict-aliasing \ -fno-strict-aliasing \
-fno-rtti \
-fno-exceptions \
-fno-threadsafe-statics \ -fno-threadsafe-statics \
-Wl,--wrap=malloc \ -Wl,--wrap=malloc \
-Wl,--wrap=free \ -Wl,--wrap=free \
@@ -240,8 +237,6 @@ CXXFLAGS=$(CPUFLAGS) \
-fno-non-call-exceptions \ -fno-non-call-exceptions \
-fno-use-cxa-atexit \ -fno-use-cxa-atexit \
-fno-strict-aliasing \ -fno-strict-aliasing \
-fno-rtti \
-fno-exceptions \
-fno-threadsafe-statics \ -fno-threadsafe-statics \
$(DEV_CXXFLAGS) $(DEV_CXXFLAGS)