Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

I2C: fixed some warnings

This commit is contained in:
Andrew Tridgell 2011-12-28 20:41:13 +11:00
parent f4e1f3d54d
commit 603b605eb1
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libraries/I2C/I2C.cpp
View File

@ -145,21 +145,21 @@ uint8_t I2C::beginTransmission(int address)
return(beginTransmission((uint8_t) address)); return(beginTransmission((uint8_t) address));
} }
uint8_t I2C::send(uint8_t data) uint8_t I2C::send(uint8_t databyte)
{ {
if(returnStatusWire) if(returnStatusWire)
{ {
return(returnStatusWire); return(returnStatusWire);
} }
returnStatus = 0; returnStatus = 0;
returnStatus = sendByte(data); returnStatus = sendByte(databyte);
returnStatusWire = returnStatus; returnStatusWire = returnStatus;
return(returnStatus); return(returnStatus);
} }
uint8_t I2C::send(int data) uint8_t I2C::send(int databyte)
{ {
return(send((uint8_t) data)); return(send((uint8_t) databyte));
} }
uint8_t I2C::endTransmission() uint8_t I2C::endTransmission()
@ -225,7 +225,7 @@ uint8_t I2C::write(int address, int registerAddress)
return(write((uint8_t) address, (uint8_t) registerAddress)); return(write((uint8_t) address, (uint8_t) registerAddress));
} }
uint8_t I2C::write(uint8_t address, uint8_t registerAddress, uint8_t data) uint8_t I2C::write(uint8_t address, uint8_t registerAddress, uint8_t databyte)
{ {
returnStatus = 0; returnStatus = 0;
returnStatus = start(); returnStatus = start();
@ -234,26 +234,26 @@ uint8_t I2C::write(uint8_t address, uint8_t registerAddress, uint8_t data)
if(returnStatus){return(returnStatus);} if(returnStatus){return(returnStatus);}
returnStatus = sendByte(registerAddress); returnStatus = sendByte(registerAddress);
if(returnStatus){return(returnStatus);} if(returnStatus){return(returnStatus);}
returnStatus = sendByte(data); returnStatus = sendByte(databyte);
if(returnStatus){return(returnStatus);} if(returnStatus){return(returnStatus);}
returnStatus = stop(); returnStatus = stop();
return(returnStatus); return(returnStatus);
} }
uint8_t I2C::write(int address, int registerAddress, int data) uint8_t I2C::write(int address, int registerAddress, int databyte)
{ {
return(write((uint8_t) address, (uint8_t) registerAddress, (uint8_t) data)); return(write((uint8_t) address, (uint8_t) registerAddress, (uint8_t) databyte));
} }
uint8_t I2C::write(uint8_t address, uint8_t registerAddress, char *data) uint8_t I2C::write(uint8_t address, uint8_t registerAddress, char *databytes)
{ {
uint8_t bufferLength = strlen(data); uint8_t bufferLength = strlen(databytes);
returnStatus = 0; returnStatus = 0;
returnStatus = write(address, registerAddress, (uint8_t*)data, bufferLength); returnStatus = write(address, registerAddress, (uint8_t*)databytes, bufferLength);
return(returnStatus); return(returnStatus);
} }
uint8_t I2C::write(uint8_t address, uint8_t registerAddress, uint8_t *data, uint8_t numberBytes) uint8_t I2C::write(uint8_t address, uint8_t registerAddress, uint8_t *databytes, uint8_t numberBytes)
{ {
returnStatus = 0; returnStatus = 0;
returnStatus = start(); returnStatus = start();
@ -264,7 +264,7 @@ uint8_t I2C::write(uint8_t address, uint8_t registerAddress, uint8_t *data, uint
if(returnStatus){return(returnStatus);} if(returnStatus){return(returnStatus);}
for (uint8_t i = 0; i < numberBytes; i++) for (uint8_t i = 0; i < numberBytes; i++)
{ {
returnStatus = sendByte(data[i]); returnStatus = sendByte(databytes[i]);
if(returnStatus){return(returnStatus);} if(returnStatus){return(returnStatus);}
} }
returnStatus = stop(); returnStatus = stop();