diff --git a/.gitignore b/.gitignore index de8e1c4b..cd5ac8d9 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ Logo GUI/TS100 Logo Editor/TS100 Logo Editor/obj/ Logo GUI/TS100 Logo Editor/TS100 Logo Editor/bin/ workspace/ts100/ts100.xml workspace/ts100_old/* +*.cache diff --git a/Bootup Logo/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Form1.cs b/Bootup Logo/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Form1.cs index 5067c509..9f458e9a 100644 --- a/Bootup Logo/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Form1.cs +++ b/Bootup Logo/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Form1.cs @@ -148,7 +148,7 @@ namespace TS100_Logo_Editor data[i] = data[i + 1]; 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 :) SaveFileDialog dlg = new SaveFileDialog(); dlg.Title = "Save DFU File"; diff --git a/Bootup Logo/python_logo_converter/img2ts100.py b/Bootup Logo/python_logo_converter/img2ts100.py index a5d218d6..075938a0 100644 --- a/Bootup Logo/python_logo_converter/img2ts100.py +++ b/Bootup Logo/python_logo_converter/img2ts100.py @@ -158,7 +158,7 @@ def img2hex(input_filename, # store in endian-reversed byte order 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(): diff --git a/workspace/TS100/inc/Translation.h b/workspace/TS100/inc/Translation.h index b7b6bcd2..029c2937 100644 --- a/workspace/TS100/inc/Translation.h +++ b/workspace/TS100/inc/Translation.h @@ -33,4 +33,6 @@ extern const char SettingRightChar; extern const char SettingLeftChar; extern const char SettingAutoChar; +#define LANG_EN + #endif /* TRANSLATION_H_ */ diff --git a/workspace/TS100/src/main.cpp b/workspace/TS100/src/main.cpp index 3890da16..895f5bad 100644 --- a/workspace/TS100/src/main.cpp +++ b/workspace/TS100/src/main.cpp @@ -1010,7 +1010,7 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) { } #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() { // check if the header is there (0xAA,0x55,0xF0,0x0D)