Fix GUI storage address (same as settings bug)

Ralim · Ralim · commit 90c0bf9683a2 · 2017-12-21T23:34:57.000+11:00
diff --git 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
@@ -148,7 +148,7 @@ private void btnSaveHex_Click(object sender, EventArgs e)
                 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
@@ -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
@@ -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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ private void btnSaveHex_Click(object sender, EventArgs e)`
`148`	`148`	`data[i] = data[i + 1];`
`149`	`149`	`data[i + 1] = temp;`
`150`	`150`	`}`
`151`		`- string outputHexFile = IntelHex.IntelHex.encode(data, 0x0800B800, 16, true, true);//16 bytes is the only format the DFU seems to support //0x0800B800`
	`151`	`+ string outputHexFile = IntelHex.IntelHex.encode(data, 0x0800F800, 16, true, true);//16 bytes is the only format the DFU seems to support //0x0800B800`
`152`	`152`	`//^ This string now just needs to be written out to a text file :)`
`153`	`153`	`SaveFileDialog dlg = new SaveFileDialog();`
`154`	`154`	`dlg.Title = "Save DFU File";`
Original file line number	Diff line number	Diff line change
`@@ -1010,7 +1010,7 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) {`
`1010`	`1010`	`}`
`1011`	`1011`
`1012`	`1012`	`#define FLASH_LOGOADDR \`
`1013`		`- (0x8000000 \| 0xB800) /second last page of flash set aside for logo image/`
	`1013`	`+ (0x8000000 \| 0xF800) /second last page of flash set aside for logo image/`
`1014`	`1014`
`1015`	`1015`	`bool showBootLogoIfavailable() {`
`1016`	`1016`	`// check if the header is there (0xAA,0x55,0xF0,0x0D)`