aboutsummaryrefslogtreecommitdiffhomepage
path: root/AT91SAM7S256/Source/c_cmd.c
diff options
context:
space:
mode:
Diffstat (limited to 'AT91SAM7S256/Source/c_cmd.c')
-rw-r--r--AT91SAM7S256/Source/c_cmd.c25
1 files changed, 13 insertions, 12 deletions
diff --git a/AT91SAM7S256/Source/c_cmd.c b/AT91SAM7S256/Source/c_cmd.c
index 2909201..d2b2203 100644
--- a/AT91SAM7S256/Source/c_cmd.c
+++ b/AT91SAM7S256/Source/c_cmd.c
@@ -702,6 +702,7 @@ UWORD cCmdHandleRemoteCommands(UBYTE * pInBuf, UBYTE * pOutBuf, UBYTE * pLen)
pIn->SensorType = pInBuf[2];
pIn->SensorMode = pInBuf[3];
+
//Set InvalidData flag automatically since type may have changed
pIn->InvalidData = TRUE;
}
@@ -2305,7 +2306,7 @@ void cCmdResetDevices(void)
for (i = 0; i < NO_OF_INPUTS; i++)
{
- INPUTSTRUCT * pIn = &(pMapInput->Inputs[i]);
+ INPUTSTRUCT * pIn = &(pMapInput->Inputs[i]);
//Clear type and mode to defaults
pIn->SensorType = NO_SENSOR;
pIn->SensorMode = RAWMODE;
@@ -3672,12 +3673,12 @@ NXT_STATUS cCmdDatalogRead(UBYTE * pBuffer, UWORD Length, UBYTE Remove)
NXT_STATUS cCmdColorSensorRead (UBYTE Port, SWORD * SensorValue, UWORD * RawArray, UWORD * NormalizedArray,
SWORD * ScaledArray, UBYTE * InvalidData)
{
- ULONG i;
+ ULONG i;
//Make sure Port is valid for Color Sensor
- INPUTSTRUCT * pIn = &(pMapInput->Inputs[Port]);
+ INPUTSTRUCT * pIn = &(pMapInput->Inputs[Port]);
UBYTE sType = pIn->SensorType;
- if (!(sType == COLORFULL || sType == COLORRED || sType == COLORGREEN ||
- sType == COLORBLUE || sType == COLORNONE))
+ if (!(sType == COLORFULL || sType == COLORRED || sType == COLORGREEN ||
+ sType == COLORBLUE || sType == COLORNONE))
{
return (ERR_COMM_CHAN_NOT_READY); //TODO - is this the right error?
}
@@ -3687,9 +3688,9 @@ NXT_STATUS cCmdColorSensorRead (UBYTE Port, SWORD * SensorValue, UWORD * RawArra
//Copy all raw, normalized and scaled data from I/O Map
for (i=0; i<NO_OF_COLORS; i++){
COLORSTRUCT * pColor = &(pMapInput->Colors[Port]);
- RawArray[i] = pColor->ADRaw[i];
+ RawArray[i] = pColor->ADRaw[i];
NormalizedArray[i] = pColor->SensorRaw[i];
- ScaledArray[i] = pColor->SensorValue[i];
+ ScaledArray[i] = pColor->SensorValue[i];
}
//Copy the Invalid Data Flag
*InvalidData = pIn->InvalidData;
@@ -3882,11 +3883,11 @@ ULONG cCmdGetSByte(void * pVal) {
ULONG cCmdGetFloat(void * pVal) {
float tempVal = *(float*)pVal;
- if (tempVal >= (float)0.0) {
- tempVal += (float)0.5;
+ if (tempVal >= 0.0f) {
+ tempVal += 0.5f;
}
else {
- tempVal -= (float)0.5;
+ tempVal -= 0.5f;
}
return (ULONG)tempVal;
}
@@ -5230,7 +5231,7 @@ NXT_STATUS cCmdInterpUnop2(CODE_WORD * const pCode)
if (TypeCode2 == TC_FLOAT)
{
FltArgVal2 = cCmdGetFloatValFromDataArg(Arg2, 0);
- if ((FltArgVal2 > (float)99999999999.9999)||(FltArgVal2 < (float)-9999999999.9999)){ // these are the widest %.4f numbers that will fit on display
+ if ((FltArgVal2 > 99999999999.9999f)||(FltArgVal2 < -9999999999.9999f)){ // these are the widest %.4f numbers that will fit on display
Count = sprintf(Buffer, "%.6g", FltArgVal2);
}
else
@@ -7836,7 +7837,7 @@ NXT_STATUS cCmdLSWrite(UBYTE Port, UBYTE BufLength, UBYTE *pBuf, UBYTE ResponseL
//Only start writing process if port is properly configured and c_lowspeed module is ready
if ((pInput->SensorType == LOWSPEED_9V || pInput->SensorType == LOWSPEED)
&& (pInput->InvalidData == FALSE)
- && (LOWSPEED_IDLE == *pChState) || (LOWSPEED_ERROR == *pChState))
+ && (*pChState == LOWSPEED_IDLE) || (*pChState == LOWSPEED_ERROR))
{
pOutBuf->InPtr = 0;
pOutBuf->OutPtr = 0;