aboutsummaryrefslogtreecommitdiff
path: root/AT91SAM7S256/Source
diff options
context:
space:
mode:
authortcsadmin2011-01-21 22:44:30 +0000
committerNicolas Schodet2011-07-04 00:37:04 +0200
commite6955bc46ce1c07934807323acc502148c99f1f9 (patch)
tree487a5a05753442473f1965d108c7df0ab5d79fee /AT91SAM7S256/Source
parent35881fb1c31cc215a64991b877913e519123fec9 (diff)
Revised the stripped version of the firmware
git-svn-id: https://mindboards.svn.sourceforge.net/svnroot/mindboards/lms_nbcnxc/branches/version_131@33 c9361245-7fe8-9947-84e8-057757c4e366
Diffstat (limited to 'AT91SAM7S256/Source')
-rw-r--r--AT91SAM7S256/Source/Functions.inl26
-rw-r--r--AT91SAM7S256/Source/c_ui.c16
-rw-r--r--AT91SAM7S256/Source/c_ui.h6
-rw-r--r--AT91SAM7S256/Source/c_ui.iom4
4 files changed, 26 insertions, 26 deletions
diff --git a/AT91SAM7S256/Source/Functions.inl b/AT91SAM7S256/Source/Functions.inl
index 3b9410b..54df0c4 100644
--- a/AT91SAM7S256/Source/Functions.inl
+++ b/AT91SAM7S256/Source/Functions.inl
@@ -19,12 +19,12 @@
//******* cUiBtTest **********************************************************
const UBYTE NONVOLATILE_NAME[] = UI_NONVOLATILE; // Non volatile filename without extention
-#ifdef INCLUDE_OBP
+#ifndef STRIPPED
const UBYTE DEFAULT_PROGRAM_NAME[] = UI_PROGRAM_DEFAULT; // On brick programming filename without extention
const UBYTE TEMP_PROGRAM_FILENAME[] = UI_PROGRAM_TEMP; // On brick programming tmp filename without extention
const UBYTE VM_PROGRAM_READER[] = UI_PROGRAM_READER; // On brick programming script reader filename without extention
#endif
-#ifdef INCLUDE_DATALOG
+#ifndef STRIPPED
const UBYTE TEMP_DATALOG_FILENAME[] = UI_DATALOG_TEMP; // On brick datalog tmp filename without extention
const UBYTE DEFAULT_DATALOG_NAME[] = UI_DATALOG_DEFAULT; // On brick datalog filename without extention
#endif
@@ -230,7 +230,7 @@ UBYTE cUiReadLowspeed(UBYTE Port,UBYTE RxBytes,UWORD *Value)
void cUiUpdateSensor(SWORD Time)
{
-#ifdef INCLUDE_DATALOG
+#ifndef STRIPPED
UBYTE Port;
UBYTE Sensor;
@@ -429,7 +429,7 @@ const UBYTE COLORNAME[COLORNAMES][10] =
void cUiPrintSensorInDisplayBuffer(UBYTE Port)
{
-#ifdef INCLUDE_DATALOG
+#ifndef STRIPPED
UBYTE Sensor;
float Value;
SWORD Size;
@@ -1136,7 +1136,7 @@ UBYTE cUiVolume(UBYTE Action) // MENU_INIT,MENU_LEFT,MENU_RIGHT,MENU_EXIT
{
VarsUi.Counter = VarsUi.NVData.VolumeStep + 1;
-#ifdef INCLUDE_OBP
+#ifndef STRIPPED
VarsUi.pTmp = (UBYTE*)Cursor;
for (VarsUi.Tmp = 0;(VarsUi.Tmp < SIZE_OF_CURSOR) && (VarsUi.Tmp < (UBYTE)sizeof(Cursor));VarsUi.Tmp++)
{
@@ -1186,7 +1186,7 @@ UBYTE cUiVolume(UBYTE Action) // MENU_INIT,MENU_LEFT,MENU_RIGHT,MENU_EXIT
sprintf((char*)VarsUi.DisplayBuffer,"%u",(UWORD)VarsUi.Counter - 1);
pMapDisplay->pTextLines[TEXTLINE_3] = VarsUi.DisplayBuffer;
-#ifdef INCLUDE_OBP
+#ifndef STRIPPED
pMapDisplay->pBitmaps[BITMAP_1] = (BMPMAP*)VarsUi.CursorTmp;
VarsUi.CursorTmp[4] = 46;
VarsUi.CursorTmp[5] = 24;
@@ -1488,7 +1488,7 @@ void cUiDrawPortNo(UBYTE *Bitmap,UBYTE MenuIconNo,UBYTE PortNo)
UBYTE cUiDataLogging(UBYTE Action)
{
-#ifdef INCLUDE_DATALOGGING
+#ifndef STRIPPED
SBYTE TmpBuffer[DATALOGBUFFERSIZE + 1];
switch (Action)
@@ -2081,7 +2081,7 @@ void cUiRunning(UBYTE Action)
UBYTE cUiOnBrickProgramming(UBYTE Action) // On brick programming
{
-#ifdef INCLUDE_OBP
+#ifndef STRIPPED
switch (Action)
{
case MENU_INIT : // Show motor / sensor text
@@ -2692,7 +2692,7 @@ UBYTE cUiFileRun(UBYTE Action) // Run selected file
}
}
break;
-#ifdef INCLUDE_OBP
+#ifndef STRIPPED
case (FILETYPE_NXT * 10 + 0) :// Start Program file (*.prg)
{
VarsUi.TmpHandle = pMapLoader->pFunc(OPENREAD,VarsUi.SelectedFilename,NULL,&VarsUi.TmpLength);
@@ -2861,7 +2861,7 @@ UBYTE cUiView(UBYTE Action) // MENU_INIT
pMapDisplay->TextLinesCenterFlags |= TEXTLINE_BIT(TEXTLINE_3);
pMapDisplay->UpdateMask |= TEXTLINE_BIT(TEXTLINE_3);
pMapDisplay->EraseMask |= SCREEN_BIT(SCREEN_SMALL);
-#ifdef INCLUDE_DATALOG
+#ifndef STRIPPED
// Init ports
for (VarsUi.Tmp = 0;VarsUi.Tmp < DATALOGPORTS;VarsUi.Tmp++)
{
@@ -2880,7 +2880,7 @@ UBYTE cUiView(UBYTE Action) // MENU_INIT
if ((Action >= MENU_PORT_1) && (Action <= MENU_PORT_C))
{
VarsUi.SelectedPort = Action;
-#ifdef INCLUDE_DATALOG
+#ifndef STRIPPED
VarsUi.DatalogPort[VarsUi.SelectedPort - MENU_PORT_1] = VarsUi.SelectedSensor;
#endif
@@ -3985,7 +3985,7 @@ UBYTE cUiPowerOffTime(UBYTE Action) // MENU_INIT,MENU_LEFT,MENU_RIGHT,MENU_E
{
VarsUi.Counter = VarsUi.NVData.PowerdownCode + 1;
-#ifdef INCLUDE_OBP
+#ifndef STRIPPED
VarsUi.pTmp = (UBYTE*)Cursor;
for (VarsUi.Tmp = 0;(VarsUi.Tmp < SIZE_OF_CURSOR) && (VarsUi.Tmp < (UBYTE)sizeof(Cursor));VarsUi.Tmp++)
{
@@ -4034,7 +4034,7 @@ UBYTE cUiPowerOffTime(UBYTE Action) // MENU_INIT,MENU_LEFT,MENU_RIGHT,MENU_E
}
pMapDisplay->pTextLines[TEXTLINE_3] = VarsUi.DisplayBuffer;
-#ifdef INCLUDE_OBP
+#ifndef STRIPPED
pMapDisplay->pBitmaps[BITMAP_1] = (BMPMAP*)VarsUi.CursorTmp;
VarsUi.CursorTmp[4] = 46;
VarsUi.CursorTmp[5] = 24;
diff --git a/AT91SAM7S256/Source/c_ui.c b/AT91SAM7S256/Source/c_ui.c
index 53c1f82..09d35fe 100644
--- a/AT91SAM7S256/Source/c_ui.c
+++ b/AT91SAM7S256/Source/c_ui.c
@@ -59,7 +59,7 @@ const HEADER cUi =
#include "Display.txt" // Bitmap for frame used in view and datalog
#include "LowBattery.txt" // Bitmap showed when low battery occures
#include "Font.txt" // Font used for all text
-#ifdef INCLUDE_OBP
+#ifndef STRIPPED
#include "Step.txt" // Bitmap used in On Brick Programming
#endif
#include "Cursor.txt" // Bitmap for cursor
@@ -71,7 +71,7 @@ const HEADER cUi =
#include "Info.txt" // Bitmap for feedback
#include "Icons.txt" // Icon collection used for menues
-#ifdef INCLUDE_INTRO
+#ifndef STRIPPED
// ****** INTRO ANIMATION RESOURCES ******************************************
#include "RCXintro_1.txt" // Bitmap for picture 1 in the intro animation
@@ -1285,7 +1285,7 @@ void cUiCtrl(void)
VarsUi.CRPasskey++;
VarsUi.ButtonTimer++;
-#ifdef INCLUDE_OBP
+#ifndef STRIPPED
VarsUi.OBPTimer++;
#endif
switch (IOMapUi.State)
@@ -1307,7 +1307,7 @@ void cUiCtrl(void)
pMapDisplay->pFont = (FONT*)Font;
pMapDisplay->pStatusIcons = (ICON*)Status;
pMapDisplay->pStatusText = (UBYTE*)VarsUi.StatusText;
-#ifdef INCLUDE_OBP
+#ifndef STRIPPED
pMapDisplay->pStepIcons = (ICON*)Step;
#endif
@@ -1328,7 +1328,7 @@ void cUiCtrl(void)
IOMapUi.State = INIT_INTRO;
pMapDisplay->EraseMask = SCREEN_BIT(SCREEN_BACKGROUND);
-#ifdef INCLUDE_INTRO
+#ifndef STRIPPED
pMapDisplay->pBitmaps[BITMAP_1] = (BMPMAP*)Intro[VarsUi.Pointer];
#endif
pMapDisplay->UpdateMask = BITMAP_BIT(BITMAP_1);
@@ -1346,7 +1346,7 @@ void cUiCtrl(void)
{
VarsUi.LowBattHasOccured = 2;
pMapDisplay->EraseMask = SCREEN_BIT(SCREEN_BACKGROUND);
-#ifdef INCLUDE_INTRO
+#ifndef STRIPPED
pMapDisplay->pBitmaps[BITMAP_1] = (BMPMAP*)Intro[VarsUi.Pointer];
#endif
pMapDisplay->UpdateMask = BITMAP_BIT(BITMAP_1);
@@ -1380,7 +1380,7 @@ void cUiCtrl(void)
VarsUi.LowBattHasOccured = 1;
}
}
-#ifdef INCLUDE_INTRO
+#ifndef STRIPPED
if (++VarsUi.Timer >= (INTRO_SHIFT_TIME))
{
switch (VarsUi.State)
@@ -1440,7 +1440,7 @@ void cUiCtrl(void)
}
}
break;
-#ifdef INCLUDE_INTRO
+#ifndef STRIPPED
case INIT_WAIT :
{
if (++VarsUi.Timer >= INTRO_STOP_TIME)
diff --git a/AT91SAM7S256/Source/c_ui.h b/AT91SAM7S256/Source/c_ui.h
index 83d5a62..e55e4eb 100644
--- a/AT91SAM7S256/Source/c_ui.h
+++ b/AT91SAM7S256/Source/c_ui.h
@@ -19,7 +19,7 @@
#ifndef C_UI
#define C_UI
-#ifdef INCLUDE_DATALOG
+#ifndef STRIPPED
#define DATALOGENABLED 1 // 1 == Datalog enable
#else
#define DATALOGENABLED 0 // 0 == Datalog disabled
@@ -287,7 +287,7 @@ typedef struct
UBYTE FileRight; // File right
UBYTE NoOfFiles; // No of files
-#ifdef INCLUDE_OBP
+#ifndef STRIPPED
// On brick programming menu
UBYTE ProgramSteps[ON_BRICK_PROGRAMSTEPS]; // On brick programming steps
UBYTE ProgramStepPointer; // On brick programming step pointer
@@ -343,7 +343,7 @@ typedef struct
SLONG ViewSampleValue; // Latch for sensor values
UBYTE ViewSampleValid; // Latch for sensor valid
-#ifdef INCLUDE_DATALOG
+#ifndef STRIPPED
// Datalog
ULONG DatalogOldTick;
ULONG DatalogRTC; // Real time in mS
diff --git a/AT91SAM7S256/Source/c_ui.iom b/AT91SAM7S256/Source/c_ui.iom
index 6adcbc0..9cfe925 100644
--- a/AT91SAM7S256/Source/c_ui.iom
+++ b/AT91SAM7S256/Source/c_ui.iom
@@ -31,12 +31,12 @@ enum
// Various filenames without extension
#define UI_NONVOLATILE "NVConfig" // Ui non volatile config filename
-#ifdef INCLUDE_OBP
+#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
-#ifdef INCLUDE_DATALOG
+#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