From e6955bc46ce1c07934807323acc502148c99f1f9 Mon Sep 17 00:00:00 2001 From: tcsadmin Date: Fri, 21 Jan 2011 22:44:30 +0000 Subject: 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 --- AT91SAM7S256/Source/Functions.inl | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'AT91SAM7S256/Source/Functions.inl') 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; -- cgit v1.2.3