aboutsummaryrefslogtreecommitdiff
path: root/AT91SAM7S256/Source/c_ui.iom
diff options
context:
space:
mode:
authorNicolas Schodet2011-07-04 01:23:24 +0200
committerNicolas Schodet2011-07-04 01:27:42 +0200
commitc331530002825a86f12151266a9772167a3a49ce (patch)
tree9a4bb16c6a87e30629da039e82cbf026dc361009 /AT91SAM7S256/Source/c_ui.iom
parent0cb650f1cf6f446bbb0186300a198b5936f49bb4 (diff)
parentb0472321014e8fcb110f4cecad734bb6a7e27ae0 (diff)
Merge branch 'jch-import' into jch-mergejch-merge
Conflicts: AT91SAM7S256/Source/BtTest.inc AT91SAM7S256/Source/Functions.inl AT91SAM7S256/Source/Ui.txt AT91SAM7S256/Source/c_cmd.c AT91SAM7S256/Source/c_input.c AT91SAM7S256/Source/c_output.c AT91SAM7S256/Source/c_ui.c AT91SAM7S256/Source/c_ui.h AT91SAM7S256/Source/d_loader.h AT91SAM7S256/Source/d_lowspeed.r AT91SAM7S256/Source/d_output.c AT91SAM7S256/Source/d_output.h
Diffstat (limited to 'AT91SAM7S256/Source/c_ui.iom')
-rw-r--r--AT91SAM7S256/Source/c_ui.iom6
1 files changed, 6 insertions, 0 deletions
diff --git a/AT91SAM7S256/Source/c_ui.iom b/AT91SAM7S256/Source/c_ui.iom
index 770b682..9cfe925 100644
--- a/AT91SAM7S256/Source/c_ui.iom
+++ b/AT91SAM7S256/Source/c_ui.iom
@@ -31,15 +31,20 @@ enum
// Various filenames without extension
#define UI_NONVOLATILE "NVConfig" // Ui non volatile config filename
+#ifndef STRIPPED
#define UI_PROGRAM_DEFAULT "Untitled" // On brick programming default filename
#define UI_PROGRAM_TEMP "Program" // On brick programming tmp filename
#define UI_PROGRAM_READER "RPGReader" // On brick programming script reader filename
+#endif
+#ifndef STRIPPED
#define UI_DATALOG_FILENAME "OBD_" // On brick datalog filename
#define UI_DATALOG_DEFAULT "Untitled" // On brick datalog default name
#define UI_DATALOG_TEMP "Tmp" // On brick datalog tmp filename
+#endif
#define UI_STARTUP_SOUND "! Startup" // Sound file activated when the menu system starts up
#define UI_KEYCLICK_SOUND "! Click" // Sound file activated when key pressed in the menu system
#define UI_ATTENTION_SOUND "! Attention" // Sound file activated when incomming BT requests attention
+#define UI_STARTUP_PROGRAM "! Startup.rxe" // Program file activated when the NXT boots
// Various text strings
#define UI_NAME_DEFAULT "NXT" // Default blue tooth name
@@ -122,6 +127,7 @@ typedef struct
UBYTE Error; // W - Error code
UBYTE OBPPointer; // W - Actual OBP step (0 - 4)
UBYTE ForceOff; // W - Force off (> 0 = off)
+ UBYTE AbortFlag; // RW - Abort on this button state
}IOMAPUI;
#endif