sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Merge branch 'dev' into test-slow-i2c

Browse Source
This commit is contained in:
Ben V. Brown
2022-11-06 21:32:00 +11:00
parent d260ee99df f11f550e0b
commit d2580a7889
39 changed files with 4880 additions and 4878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
source/Core/Inc/Translation.h
View File

@@ -36,39 +36,39 @@ extern const char *PowerSourceNames[];
enum class SettingsItemIndex : uint8_t {
DCInCutoff,
MinVolCell,
QCMaxVoltage,
PDNegTimeout,
BoostTemperature,
AutoStart,
TempChangeShortStep,
TempChangeLongStep,
LockingMode,
MotionSensitivity,
SleepTemperature,
SleepTimeout,
ShutdownTimeout,
MotionSensitivity,
TemperatureUnit,
AdvancedIdle,
DisplayRotation,
BoostTemperature,
AutoStart,
CooldownBlink,
CalibrateCJC,
SettingsReset,
VoltageCalibration,
AdvancedSoldering,
ScrollingSpeed,
QCMaxVoltage,
PDNegTimeout,
PowerLimit,
ReverseButtonTempChange,
TempChangeShortStep,
TempChangeLongStep,
PowerPulsePower,
HallEffSensitivity,
LockingMode,
MinVolCell,
AnimLoop,
TemperatureUnit,
DisplayRotation,
CooldownBlink,
ScrollingSpeed,
ReverseButtonTempChange,
AnimSpeed,
PowerPulseWait,
PowerPulseDuration,
LanguageSwitch,
AnimLoop,
Brightness,
ColourInversion,
LOGOTime,
AdvancedIdle,
AdvancedSoldering,
PowerLimit,
CalibrateCJC,
VoltageCalibration,
PowerPulsePower,
PowerPulseWait,
PowerPulseDuration,
SettingsReset,
LanguageSwitch,
NUM_ITEMS,
};

27
source/Makefile
View File

@@ -17,7 +17,7 @@ HEXFILE_DIR=Hexfile
OUTPUT_DIR_BASE=Objects
OUTPUT_DIR=Objects/$(model)
ALL_LANGUAGES=BG CS DA DE EN ES FI FR HR HU IT JA_JP LT NL NL_BE NO PL PT RU SK SL SR_CYRL SR_LATN SV TR UK VI YUE_HK ZH_CN ZH_TW
ALL_LANGUAGES=BG CS DA DE EN ES FI FR HR HU IT JA_JP LT NL NL_BE NB PL PT RU SK SL SR_CYRL SR_LATN SV TR UK VI YUE_HK ZH_CN ZH_TW
LANGUAGE_GROUP_CJK_LANGS=EN JA_JP YUE_HK ZH_TW ZH_CN
LANGUAGE_GROUP_CJK_NAME=Chinese+Japanese
@@ -472,6 +472,30 @@ firmware-%: $(HEXFILE_DIR)/$(model)_%.hex $(HEXFILE_DIR)/$(model)_%.bin $(HEXFIL
python3 dfuse-pack.py -b $(DEVICE_DFU_ADDRESS)@0:$< -D $(DEVICE_DFU_VID_PID) $@
$(HEXFILE_DIR)/$(model)_%.elf : \
$(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \
$(OUTPUT_DIR)/Core/Gen/Translation.%.o \
$(OUTPUT_DIR)/Core/LangSupport/lang_single.o \
Makefile $(LDSCRIPT)
@test -d $(@D) || mkdir -p $(@D)
@echo Linking $@
@$(CPP) $(CXXFLAGS) $(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \
$(OUTPUT_DIR)/Core/Gen/Translation.$*.o \
$(OUTPUT_DIR)/Core/LangSupport/lang_single.o \
$(LIBS) $(LINKER_FLAGS) -o$@ -Wl,-Map=$@.map
$(HEXFILE_DIR)/$(model)_string_compressed_%.elf : \
$(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \
$(OUTPUT_DIR)/Core/Gen/Translation_brieflz.%.o \
$(OUTPUT_DIR)/Core/LangSupport/lang_single.o \
Makefile $(LDSCRIPT)
@test -d $(@D) || mkdir -p $(@D)
@echo Linking $@
@$(CPP) $(CXXFLAGS) $(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \
$(OUTPUT_DIR)/Core/Gen/Translation_brieflz.$*.o \
$(OUTPUT_DIR)/Core/LangSupport/lang_single.o \
$(LIBS) $(LINKER_FLAGS) -o$@ -Wl,-Map=$@.map
$(HEXFILE_DIR)/$(model)_font_compressed_%.elf : \
$(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \
$(OUTPUT_DIR)/Core/Gen/Translation_brieflz_font.%.o \
$(OUTPUT_DIR)/Core/LangSupport/lang_single.o \
@@ -483,7 +507,6 @@ $(HEXFILE_DIR)/$(model)_%.elf : \
$(OUTPUT_DIR)/Core/LangSupport/lang_single.o \
$(LIBS) $(LINKER_FLAGS) -o$@ -Wl,-Map=$@.map
$(OUT_OBJS): $(OUTPUT_DIR)/%.o : %.c Makefile
@test -d $(@D) || mkdir -p $(@D)
@echo Compiling ${<}