me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix GUI storage address (same as settings bug)

Browse Source
This commit is contained in:
Ben V. Brown
2017-12-21 23:34:57 +11:00
parent 1bc62adc6c
commit 90c0bf9683
5 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -42,3 +42,4 @@ Logo GUI/TS100 Logo Editor/TS100 Logo Editor/obj/
Logo GUI/TS100 Logo Editor/TS100 Logo Editor/bin/ Logo GUI/TS100 Logo Editor/TS100 Logo Editor/bin/
workspace/ts100/ts100.xml workspace/ts100/ts100.xml
workspace/ts100_old/* workspace/ts100_old/*
*.cache

2
Bootup Logo/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Form1.cs
View File

@@ -148,7 +148,7 @@ namespace TS100_Logo_Editor
data[i] = data[i + 1]; data[i] = data[i + 1];
data[i + 1] = temp; data[i + 1] = temp;
} }
string outputHexFile = IntelHex.IntelHex.encode(data, 0x0800B800, 16, true, true);//16 bytes is the only format the DFU seems to support //0x0800B800 string outputHexFile = IntelHex.IntelHex.encode(data, 0x0800F800, 16, true, true);//16 bytes is the only format the DFU seems to support //0x0800B800
//^ This string now just needs to be written out to a text file :) //^ This string now just needs to be written out to a text file :)
SaveFileDialog dlg = new SaveFileDialog(); SaveFileDialog dlg = new SaveFileDialog();
dlg.Title = "Save DFU File"; dlg.Title = "Save DFU File";

2
Bootup Logo/python_logo_converter/img2ts100.py
View File

@@ -158,7 +158,7 @@ def img2hex(input_filename,
# store in endian-reversed byte order # store in endian-reversed byte order
data[4 + ndx + (1 if ndx % 2 == 0 else -1)] = byte data[4 + ndx + (1 if ndx % 2 == 0 else -1)] = byte
intel_hex(output_file, data, 0x0800B800) intel_hex(output_file, data, 0x0800F800)
def parse_commandline(): def parse_commandline():

2
workspace/TS100/inc/Translation.h
View File

@@ -33,4 +33,6 @@ extern const char SettingRightChar;
extern const char SettingLeftChar; extern const char SettingLeftChar;
extern const char SettingAutoChar; extern const char SettingAutoChar;
#define LANG_EN
#endif /* TRANSLATION_H_ */ #endif /* TRANSLATION_H_ */

2
workspace/TS100/src/main.cpp
View File

@@ -1010,7 +1010,7 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) {
} }
#define FLASH_LOGOADDR \ #define FLASH_LOGOADDR \
(0x8000000 | 0xB800) /*second last page of flash set aside for logo image*/ (0x8000000 | 0xF800) /*second last page of flash set aside for logo image*/
bool showBootLogoIfavailable() { bool showBootLogoIfavailable() {
// check if the header is there (0xAA,0x55,0xF0,0x0D) // check if the header is there (0xAA,0x55,0xF0,0x0D)