This commit is contained in:
hg
2014-02-20 23:33:22 +01:00
parent fea50732b3
commit bc8a9023aa
2 changed files with 56 additions and 38 deletions

View File

@ -115,12 +115,6 @@ void AD7190_SetRegisterValue(unsigned char registerAddress,
unsigned char bytesNumber,
unsigned char modifyCS)
{
// Serial.print("set: ");
// Serial.print(registerAddress, 16); Serial.print(", ");
// Serial.print(registerValue, 16); Serial.print(", ");
// Serial.print(bytesNumber);
// Serial.println();
unsigned char writeCommand[5] = {0, 0, 0, 0, 0};
unsigned char* dataPointer = (unsigned char*)&registerValue;
unsigned char bytesNr = bytesNumber;
@ -149,11 +143,7 @@ unsigned long AD7190_GetRegisterValue(unsigned char registerAddress,
unsigned char bytesNumber,
unsigned char modifyCS)
{
// Serial.print("get: ");
// Serial.print(registerAddress, 16); Serial.print(", ");
// Serial.print(bytesNumber);
unsigned char registerWord[5] = {0, 0, 0, 0, 0};
unsigned char registerWord[5] = {0, 0, 0, 0, 0};
unsigned long buffer = 0x0;
unsigned char i = 0;
@ -165,9 +155,6 @@ unsigned long AD7190_GetRegisterValue(unsigned char registerAddress,
buffer = (buffer << 8) + registerWord[i];
}
// Serial.print(buffer, 16); Serial.print(", ");
// Serial.println();
return buffer;
}
@ -334,30 +321,15 @@ unsigned long AD7190_SingleConversion(void)
unsigned long command = 0x0;
unsigned long regData = 0x0;
// command = (((1L) & 0x7) << 21);
// Serial.print("Command1: ");
// Serial.println(command, 16);
// command |= (((2L) & 0x3) << 18);
// Serial.print("Command2: ");
// Serial.println(command, 16);
// command |= ((0x060) & 0x3FF);
// Serial.print("Command3: ");
// Serial.println(command, 16);
command = AD7190_MODE_SEL(AD7190_MODE_SINGLE) |
AD7190_MODE_CLKSRC(AD7190_CLK_INT_CO) |
AD7190_MODE_CLKSRC(AD7190_CLK_INT) |
AD7190_MODE_RATE(0x060);
//Serial.print("Command: ");
//Serial.println(command, 16);
//ADI_PART_CS_LOW;
SPI_Enable(AD7190_SLAVE_ID);
AD7190_SetRegisterValue(AD7190_REG_MODE, command, 3, 0); // CS is not modified.
AD7190_WaitRdyGoLow();
regData = AD7190_GetRegisterValue(AD7190_REG_DATA, 3, 0);
//Serial.print("result: ");
//Serial.println(regData, 16);
//ADI_PART_CS_HIGH;
SPI_Disable(AD7190_SLAVE_ID);