aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNicolas Schodet2024-08-25 22:14:49 +0200
committerNicolas Schodet2024-08-25 22:14:49 +0200
commitedbf1c86db94991af299df17a226702f3e0860c4 (patch)
treeae82c867cadccd7cebfc7f66d58e51e8e37d35ee /src
parent141cf850a9a252809ab00c5f56ce3206efea448e (diff)
Rewrite Ui.txt as regular C string array
Diffstat (limited to 'src')
-rw-r--r--src/Ui.txt72
-rw-r--r--src/Ui_txt.h65
-rw-r--r--src/c_ui.c11
-rw-r--r--src/modules.h14
4 files changed, 68 insertions, 94 deletions
diff --git a/src/Ui.txt b/src/Ui.txt
deleted file mode 100644
index fb2a259..0000000
--- a/src/Ui.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-const TXT Ui =
-{
- 0x05,0x00, // Text Format
- 0x04,0x0D, // Text DataSize
- 0x01, // ItemsX
- 0x3D, // ItemsY
- 0x11, // ItemCharsX
- 0x01, // ItemCharsY
- {
- 'C','o','n','n','e','c','t','i','n','g', 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'L','i','n','e',' ','i','s',' ','b','u','s','y', 0 , 0 , 0 , 0 , 0 ,
- 'F','a','i','l','e','d','!', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'C','o','n','n','e','c','t','i','o','n','?', 0 , 0 , 0 , 0 , 0 , 0 ,
- 'S','e','n','d','i','n','g',' ','f','i','l','e', 0 , 0 , 0 , 0 , 0 ,
- 'F','a','i','l','e','d','!', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'T','u','r','n','i','n','g',' ','o','n', 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'F','a','i','l','e','d','!', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'T','u','r','n','i','n','g',' ','o','f','f', 0 , 0 , 0 , 0 , 0 , 0 ,
- 'F','a','i','l','e','d','!', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'S','e','a','r','c','h','i','n','g', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'A','b','o','r','t','e','d','!', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'F','a','i','l','e','d','!', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'F','a','i','l','e','d','!', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'F','a','i','l','e','d','!', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'M','e','m','o','r','y',' ','f','u','l','l','!', 0 , 0 , 0 , 0 , 0 ,
- 'F','i','l','e',' ','s','a','v','e','d', 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'F','i','l','e',' ','e','x','i','s','t','s', 0 , 0 , 0 , 0 , 0 , 0 ,
- 'o','v','e','r','w','r','i','t','e','!', 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'S','a','v','e','d',' ','a','s', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'F','i','l','e',' ','e','x','i','s','t', 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'o','v','e','r','w','r','i','t','e','!', 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'F','i','l','e',' ','d','e','l','e','t','e','d', 0 , 0 , 0 , 0 , 0 ,
- 'F','i','l','e','s', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'd','e','l','e','t','e','d', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'R','u','n','n','i','n','g', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'A','b','o','r','t','e','d','!', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'D','o','n','e', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'F','i','l','e',' ','e','r','r','o','r','!', 0 , 0 , 0 , 0 , 0 , 0 ,
- 'D','e','l','e','t','i','n','g',' ','a','l','l', 0 , 0 , 0 , 0 , 0 ,
- '%','s',' ','f','i','l','e','s','!', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'P','r','e','s','s',' ','C','l','e','a','r',' ','t','o', 0 , 0 , 0 ,
- 's','t','o','p',' ','D','a','t','a','L','o','g','g','i','n','g', 0 ,
- 'P','o','r','t',' ','o','c','c','u','p','i','e','d','!', 0 , 0 , 0 ,
- 'H',':','M','M',':','S','S',':','0','0', 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'H','H',':','M','M',':','S','S', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'S','o','u','n','d', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'S','o','f','t','w','a','r','e', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'N','X','T', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'T','r','y',' ','M','e', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'D','a','t','a','l','o','g', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'P','a','s','s','k','e','y',':', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'F','i','l','e',' ','n','a','m','e',':', 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'P','l','e','a','s','e',' ','u','s','e',' ','p','o','r','t',':', 0 ,
- '1',' ','-',' ','T','o','u','c','h',' ','S','e','n','s','o','r', 0 ,
- '2',' ','-',' ','S','o','u','n','d',' ','S','e','n','s','o','r', 0 ,
- '3',' ','-',' ','L','i','g','h','t',' ','S','e','n','s','o','r', 0 ,
- '4',' ','-',' ','U','l','t','r','a','s','o','n','i','c',' ',' ', 0 ,
- 'B','/','C',' ','-',' ','L','/','R',' ','m','o','t','o','r','s', 0 ,
- 'S','e','l','e','c','t', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'S','e','l','e','c','t', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'S','e','l','e','c','t', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'B','T',' ','s','a','v','e',' ','d','a','t','a', 0 , 0 , 0 , 0 , 0 ,
- 'e','r','r','o','r','!', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'B','T',' ','s','t','o','r','e',' ','i','s', 0 , 0 , 0 , 0 , 0 , 0 ,
- 'f','u','l','l',' ','e','r','r','o','r','!', 0 , 0 , 0 , 0 , 0 , 0 ,
- 'B','T',' ','u','n','k','n','o','w','n', 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'a','d','d','r','.',' ','e','r','r','o','r','!', 0 , 0 , 0 , 0 , 0 ,
- 'M','e','m','o','r','y',' ','i','s', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'f','u','l','l','!', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
- 'N','e','v','e','r', 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0
- }
-};
diff --git a/src/Ui_txt.h b/src/Ui_txt.h
new file mode 100644
index 0000000..50c30e1
--- /dev/null
+++ b/src/Ui_txt.h
@@ -0,0 +1,65 @@
+/* Created from previous Ui.txt. Covered by the LEGO Open Source License. */
+const char * const Ui[] =
+{
+ "Connecting",
+ "Line is busy",
+ "Failed!",
+ "Connection?",
+ "Sending file",
+ "Failed!",
+ "Turning on",
+ "Failed!",
+ "Turning off",
+ "Failed!",
+ "Searching",
+ "Aborted!",
+ "Failed!",
+ "Failed!",
+ "Failed!",
+ "Memory full!",
+ "File saved",
+ "File exists",
+ "overwrite!",
+ "Saved as",
+ "File exist",
+ "overwrite!",
+ "File deleted",
+ "Files",
+ "deleted",
+ "Running",
+ "Aborted!",
+ "Done",
+ "File error!",
+ "Deleting all",
+ "%s files!",
+ "Press Clear to",
+ "stop DataLogging",
+ "Port occupied!",
+ "H:MM:SS:00",
+ "HH:MM:SS",
+ "Sound",
+ "Software",
+ "NXT",
+ "Try Me",
+ "Datalog",
+ "Passkey:",
+ "File name:",
+ "Please use port:",
+ "1 - Touch Sensor",
+ "2 - Sound Sensor",
+ "3 - Light Sensor",
+ "4 - Ultrasonic ",
+ "B/C - L/R motors",
+ "Select",
+ "Select",
+ "Select",
+ "BT save data",
+ "error!",
+ "BT store is",
+ "full error!",
+ "BT unknown",
+ "addr. error!",
+ "Memory is",
+ "full!",
+ "Never",
+};
diff --git a/src/c_ui.c b/src/c_ui.c
index 33939f8..f53c4c9 100644
--- a/src/c_ui.c
+++ b/src/c_ui.c
@@ -163,7 +163,7 @@ enum STATUS_NO // Index in status icon collection file
// ****** FREE TEXT GRAPHIC RESOURCES ****************************************
-#include "Ui.txt" // Text strings that is'nt defined in menu files
+#include "Ui_txt.h" // Text strings that isn't defined in menu files
enum // String index in text string file
{
@@ -368,17 +368,12 @@ UBYTE* cUiGetMenuPointer(UBYTE FileNo)
UBYTE* cUiGetString(UBYTE No) // Get string in text string file
{
UBYTE *Result = NULL;
- TXT *pUi;
- UWORD Tmp;
- pUi = (TXT*)&Ui;
if (No)
{
- if (No <= pUi->ItemsY)
+ if (No <= sizeof(Ui) / sizeof(Ui[0]))
{
- Tmp = No - 1;
- Tmp *= pUi->ItemCharsX;
- Result = &(pUi->Data[Tmp]);
+ Result = (UBYTE *) Ui[No - 1];
}
}
diff --git a/src/modules.h b/src/modules.h
index a5f3bb1..9d70cdc 100644
--- a/src/modules.h
+++ b/src/modules.h
@@ -242,20 +242,6 @@ typedef struct
{
UBYTE FormatMsb;
UBYTE FormatLsb;
- UBYTE DataBytesMsb;
- UBYTE DataBytesLsb;
- UBYTE ItemsX;
- UBYTE ItemsY;
- UBYTE ItemCharsX;
- UBYTE ItemCharsY;
- UBYTE Data[];
-}
-TXT;
-
-typedef struct
-{
- UBYTE FormatMsb;
- UBYTE FormatLsb;
UBYTE DateBytesMsb;
UBYTE DataBytesLsb;
UBYTE TonesMsb;