comparison core/I2c_Codec.cpp @ 169:94751ad27fd6

Added method to set PGA per each channel

 		return 1;
 	if(writeRegister(0x0D, 0x00))	// Headset / button press register A: disabled
 		return 1;
 	if(writeRegister(0x0E, 0x00))	// Headset / button press register B: disabled
 		return 1;
-	if(writeRegister(0x0F, 0x20))	// Left ADC PGA gain control: not muted; 0x20 = 16dB
-		return 1;
-	if(writeRegister(0x10, 0x20))	// Right ADC PGA gain control: not muted; 0x20 = 16dB
-		return 1;
-
+	if(setPga(16, 0))   // Left ADC PGA gain control: not muted; 16dB
+		return 1;
+	if(setPga(16, 1))	// Right ADC PGA gain control: not muted; 16dB
+		return 1;
+//	if(writeRegister(0x0F, 0b01000000))	// Left ADC PGA gain control: not muted; 0x20 = 16dB
+//		return 1;
+//	if(writeRegister(0x10, 0b0))	// Right ADC PGA gain control: not muted; 0x20 = 16dB
+//		return 1;
 	if(writeRegister(0x25, 0xC0))	// DAC power/driver register: DAC power on (left and right)
 		return 1;
 	if(writeRegister(0x26, 0x04))	// High power output driver register: Enable short circuit protection
 		return 1;
 	if(writeRegister(0x28, 0x02))	// High power output stage register: disable soft stepping

 	//	f_{S(ref)} = (PLLCLK_IN × K × R)/(2048 × P)
 	float k = ((double)(newSamplingRate * pllP * 2048.0f/(float)pllR)) / PLLCLK_IN ;
 	return (setPllK(k));
 }
 
+
 short unsigned int I2c_Codec::getPllJ(){
 	return pllJ;
 }
 unsigned int I2c_Codec::getPllD(){
 	return pllD;

 	long int PLLCLK_IN=12000000;
 	//	f_{S(ref)} = (PLLCLK_IN × K × R)/(2048 × P)
 	float fs = (PLLCLK_IN/2048.0f) * getPllK()*pllR/(float)pllP;
 	return fs;
 }
+
+int I2c_Codec::setPga(float newGain, unsigned short int channel){
+	unsigned short int reg;
+	if(channel == 0)
+		reg = 0x0F;
+	else if(channel == 1)
+		reg =  0x10;
+	else
+		return 1; // error, wrong channel
+	if(newGain > 59.5)
+		return 2; // error, gain out of range
+	unsigned short int value;
+	if(newGain < 0)
+		value = 0b10000000; // PGA is muted
+	else {
+		// gain is adjustable from 0 to 59.5dB in steps of 0.5dB between 0x0 and 0x7f.
+		// Values between 0b01110111 and 0b01111111 are clipped to 59.5dB
+		value = (int)(newGain * 2 + 0.5) & 0x7f;
+	}
+	printf("channel: %d, gain: %f, value: 0x%x, reg: 0x%x\n", channel, newGain, value, reg);
+	int ret = writeRegister(reg, value);
+	printf("ret: %d\n", ret);
+	return ret;
+}
+
 // Set the volume of the DAC output
 int I2c_Codec::setDACVolume(int halfDbSteps)
 {
 	dacVolumeHalfDbs = halfDbSteps;
 	if(running)
 		return writeDACVolumeRegisters(false);
 
 	return 0;
 }
 
-// Set the volume of the DAC output
+// Set the volume of the ADC input
 int I2c_Codec::setADCVolume(int halfDbSteps)
 {
 	adcVolumeHalfDbs = halfDbSteps;
 	if(running)
 		return writeADCVolumeRegisters(false);