ich777/IronOS
1
0
Fork 0
mirror of https://github.com/Ralim/IronOS.git synced 2025-07-23 20:30:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add to linking

Browse Source
This commit is contained in:
Ben Brown
2025-07-07 18:57:07 +10:00
parent f826401e76
commit 3496c6c20b
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/Core/Inc/Settings.h
View File

@@ -88,6 +88,7 @@ typedef struct {
const uint16_t increment; // Standard increment const uint16_t increment; // Standard increment
const uint16_t defaultValue; // Default vaue after reset const uint16_t defaultValue; // Default vaue after reset
} SettingConstants; } SettingConstants;
extern const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOptionsLength];
/* /*
* This struct must be a multiple of 2 bytes as it is saved / restored from * This struct must be a multiple of 2 bytes as it is saved / restored from

3
source/Core/Src/Settings.cpp
View File

@@ -27,8 +27,7 @@ bool sanitiseSettings();
#endif /* POW_QC_20V */ #endif /* POW_QC_20V */
// char (*__kaboom)[sizeof(systemSettingsType)] = 1; // Uncomment to print size at compile time // char (*__kaboom)[sizeof(systemSettingsType)] = 1; // Uncomment to print size at compile time
volatile systemSettingsType systemSettings; volatile systemSettingsType systemSettings;
extern const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOptionsLength];
void saveSettings() { void saveSettings() {
#ifdef CANT_DIRECT_READ_SETTINGS #ifdef CANT_DIRECT_READ_SETTINGS

12
source/Makefile
View File

@@ -507,6 +507,7 @@ $(HEXFILE_DIR)/$(model)_%.elf: \
@test -d $(@D) || mkdir -p $(@D) @test -d $(@D) || mkdir -p $(@D)
@echo Linking $@ @echo Linking $@
@$(CPP) $(CXXFLAGS) $(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \ @$(CPP) $(CXXFLAGS) $(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \
$(OUTPUT_DIR)/Core/Gen/settings_gen.$(model).o \
$(OUTPUT_DIR)/Core/Gen/Translation.$*.o \ $(OUTPUT_DIR)/Core/Gen/Translation.$*.o \
$(OUTPUT_DIR)/Core/LangSupport/lang_single.o \ $(OUTPUT_DIR)/Core/LangSupport/lang_single.o \
$(LIBS) $(LINKER_FLAGS) -o$@ -Wl,-Map=$@.map $(LIBS) $(LINKER_FLAGS) -o$@ -Wl,-Map=$@.map
@@ -515,10 +516,12 @@ $(HEXFILE_DIR)/$(model)_string_compressed_%.elf: \
$(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \ $(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \
$(OUTPUT_DIR)/Core/Gen/Translation_brieflz.%.o \ $(OUTPUT_DIR)/Core/Gen/Translation_brieflz.%.o \
$(OUTPUT_DIR)/Core/LangSupport/lang_single.o \ $(OUTPUT_DIR)/Core/LangSupport/lang_single.o \
$(OUTPUT_DIR)/Core/Gen/settings_gen.$(model).o \
Makefile $(LDSCRIPT) Makefile $(LDSCRIPT)
@test -d $(@D) || mkdir -p $(@D) @test -d $(@D) || mkdir -p $(@D)
@echo Linking $@ @echo Linking $@
@$(CPP) $(CXXFLAGS) $(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \ @$(CPP) $(CXXFLAGS) $(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \
$(OUTPUT_DIR)/Core/Gen/settings_gen.$(model).o \
$(OUTPUT_DIR)/Core/Gen/Translation_brieflz.$*.o \ $(OUTPUT_DIR)/Core/Gen/Translation_brieflz.$*.o \
$(OUTPUT_DIR)/Core/LangSupport/lang_single.o \ $(OUTPUT_DIR)/Core/LangSupport/lang_single.o \
$(LIBS) $(LINKER_FLAGS) -o$@ -Wl,-Map=$@.map $(LIBS) $(LINKER_FLAGS) -o$@ -Wl,-Map=$@.map
@@ -527,10 +530,12 @@ $(HEXFILE_DIR)/$(model)_font_compressed_%.elf: \
$(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \ $(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \
$(OUTPUT_DIR)/Core/Gen/Translation_brieflz_font.%.o \ $(OUTPUT_DIR)/Core/Gen/Translation_brieflz_font.%.o \
$(OUTPUT_DIR)/Core/LangSupport/lang_single.o \ $(OUTPUT_DIR)/Core/LangSupport/lang_single.o \
$(OUTPUT_DIR)/Core/Gen/settings_gen.$(model).o \
Makefile $(LDSCRIPT) Makefile $(LDSCRIPT)
@test -d $(@D) || mkdir -p $(@D) @test -d $(@D) || mkdir -p $(@D)
@echo Linking $@ @echo Linking $@
@$(CPP) $(CXXFLAGS) $(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \ @$(CPP) $(CXXFLAGS) $(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \
$(OUTPUT_DIR)/Core/Gen/settings_gen.$(model).o \
$(OUTPUT_DIR)/Core/Gen/Translation_brieflz_font.$*.o \ $(OUTPUT_DIR)/Core/Gen/Translation_brieflz_font.$*.o \
$(OUTPUT_DIR)/Core/LangSupport/lang_single.o \ $(OUTPUT_DIR)/Core/LangSupport/lang_single.o \
$(LIBS) $(LINKER_FLAGS) -o$@ -Wl,-Map=$@.map $(LIBS) $(LINKER_FLAGS) -o$@ -Wl,-Map=$@.map
@@ -625,23 +630,27 @@ $(HEXFILE_DIR)/$(model)_multi_$(2).elf: \
$(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \ $(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \
$(OUTPUT_DIR)/Core/Gen/Translation_multi.$(1).o \ $(OUTPUT_DIR)/Core/Gen/Translation_multi.$(1).o \
$(OUTPUT_DIR)/Core/LangSupport/lang_multi.o \ $(OUTPUT_DIR)/Core/LangSupport/lang_multi.o \
$(OUTPUT_DIR)/Core/Gen/settings_gen.$(model).o \
Makefile $(LDSCRIPT) Makefile $(LDSCRIPT)
@test -d $$(@D) || mkdir -p $$(@D) @test -d $$(@D) || mkdir -p $$(@D)
@echo Linking $$@ @echo Linking $$@
@$(CPP) $(CXXFLAGS) $(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \ @$(CPP) $(CXXFLAGS) $(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \
$(OUTPUT_DIR)/Core/Gen/Translation_multi.$(1).o \ $(OUTPUT_DIR)/Core/Gen/Translation_multi.$(1).o \
$(OUTPUT_DIR)/Core/LangSupport/lang_multi.o \ $(OUTPUT_DIR)/Core/LangSupport/lang_multi.o \
$(OUTPUT_DIR)/Core/Gen/settings_gen.$(model).o \
$(LIBS) $(LINKER_FLAGS) -o$$@ -Wl,-Map=$$@.map $(LIBS) $(LINKER_FLAGS) -o$$@ -Wl,-Map=$$@.map
$(HEXFILE_DIR)/$(model)_multi_compressed_$(2).elf: \ $(HEXFILE_DIR)/$(model)_multi_compressed_$(2).elf: \
$(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \ $(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \
$(OUTPUT_DIR)/Core/Gen/Translation_brieflz_multi.$(1).o \ $(OUTPUT_DIR)/Core/Gen/Translation_brieflz_multi.$(1).o \
$(OUTPUT_DIR)/Core/LangSupport/lang_multi.o \ $(OUTPUT_DIR)/Core/LangSupport/lang_multi.o \
$(OUTPUT_DIR)/Core/Gen/settings_gen.$(model).o \
Makefile $(LDSCRIPT) Makefile $(LDSCRIPT)
@test -d $$(@D) || mkdir -p $$(@D) @test -d $$(@D) || mkdir -p $$(@D)
@echo Linking $$@ @echo Linking $$@
@$(CPP) $(CXXFLAGS) $(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \ @$(CPP) $(CXXFLAGS) $(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \
$(OUTPUT_DIR)/Core/Gen/Translation_brieflz_multi.$(1).o \ $(OUTPUT_DIR)/Core/Gen/Translation_brieflz_multi.$(1).o \
$(OUTPUT_DIR)/Core/Gen/settings_gen.$(model).o \
$(OUTPUT_DIR)/Core/LangSupport/lang_multi.o \ $(OUTPUT_DIR)/Core/LangSupport/lang_multi.o \
$(LIBS) $(LINKER_FLAGS) -o$$@ -Wl,-Map=$$@.map $(LIBS) $(LINKER_FLAGS) -o$$@ -Wl,-Map=$$@.map
@@ -724,6 +733,5 @@ check-style:
# Pull in dependency info for *existing* .o files # Pull in dependency info for *existing* .o files
-include $(OUT_OBJS:.o=.d) -include $(OUT_OBJS:.o=.d)
-include $(OUT_OBJS_CPP:.o=.d) -include $(OUT_OBJS_CPP:.o=.d)
-include $(OUTPUT_DIR)/Core/Gen/Translation.*.d -include $(OUTPUT_DIR)/Core/Gen/*.d
-include $(OUTPUT_DIR)/Core/Gen/Translation_*.d
-include $(OUTPUT_DIR)/Core/Gen/translation.files/*.d -include $(OUTPUT_DIR)/Core/Gen/translation.files/*.d