aboutsummaryrefslogtreecommitdiff
path: root/AT91SAM7S256/Source/c_ui.h
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.h
parent0cb650f1cf6f446bbb0186300a198b5936f49bb4 (diff)
parentb0472321014e8fcb110f4cecad734bb6a7e27ae0 (diff)
Merge branch 'jch-import' into jch-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.h')
-rw-r--r--AT91SAM7S256/Source/c_ui.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/AT91SAM7S256/Source/c_ui.h b/AT91SAM7S256/Source/c_ui.h
index e0f8f4a..71d0e18 100644
--- a/AT91SAM7S256/Source/c_ui.h
+++ b/AT91SAM7S256/Source/c_ui.h
@@ -19,7 +19,11 @@
#ifndef C_UI
#define C_UI
+#ifndef STRIPPED
#define DATALOGENABLED 1 // 1 == Datalog enable
+#else
+#define DATALOGENABLED 0 // 0 == Datalog disabled
+#endif
#define NO_OF_FEEDBACK_CHARS 12 // Chars left when bitmap also showed
#define SIZE_OF_CURSOR 16 // Bitmap size of cursor (header + 8x8 pixels)
@@ -283,6 +287,7 @@ typedef struct
UBYTE FileRight; // File right
UBYTE NoOfFiles; // No of files
+#ifndef STRIPPED
// On brick programming menu
UBYTE ProgramSteps[ON_BRICK_PROGRAMSTEPS]; // On brick programming steps
UBYTE ProgramStepPointer; // On brick programming step pointer
@@ -290,7 +295,8 @@ typedef struct
UBYTE FileHeader[FILEHEADER_LENGTH]; // File header for programs
UBYTE *FeedBackText; // Program end text
UWORD OBPTimer; // Graphic update timer
-
+#endif
+
// BT search menu
UBYTE NoOfDevices; // BT search no of devices found
UBYTE NoOfNames; // BT search no of names found
@@ -337,6 +343,7 @@ typedef struct
SLONG ViewSampleValue; // Latch for sensor values
UBYTE ViewSampleValid; // Latch for sensor valid
+#ifndef STRIPPED
// Datalog
ULONG DatalogOldTick;
ULONG DatalogRTC; // Real time in mS
@@ -348,7 +355,8 @@ typedef struct
UWORD DatalogError; // Error code
UBYTE DatalogPort[DATALOGPORTS]; // Logging sensor
UBYTE Update; // Update icons flag
-
+#endif
+
// NV storage
ULONG NVTmpLength; // Non volatile filelength
SWORD NVTmpHandle; // Non volatile filehandle