Skip to content

Commit

Permalink
Revert "Moved received signal quality metrics back inside Si4735 class"
Browse files Browse the repository at this point in the history
- this reverts commit 65a6012.
- since pointer problems were traced to Wire, this has proven unnecessarry.
  • Loading branch information
csdexter committed Apr 15, 2012
1 parent dae0505 commit 9bea6fb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
15 changes: 6 additions & 9 deletions Si4735.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,6 @@ Si4735::Si4735(byte interface, byte pinPower, byte pinReset, byte pinGPO2,
_pinReset = pinReset;
_pinGPO2 = pinGPO2;
_pinSEN = pinSEN;
memset((void *)&_rsqm, 0x00, sizeof(_rsqm));
switch(interface){
case SI4735_INTERFACE_SPI:
_i2caddr = 0x00;
Expand Down Expand Up @@ -608,16 +607,14 @@ void Si4735::getRSQ(Si4735_RX_Metrics* RSQ){
getResponse(_response);

//Pull the response data into their respecive fields
_rsqm.RSSI = _response[4];
_rsqm.SNR = _response[5];
RSQ->RSSI = _response[4];
RSQ->SNR = _response[5];
if(_mode == SI4735_MODE_FM){
_rsqm.PILOT = _response[3] & SI4735_STATUS_PILOT;
_rsqm.STBLEND = (_response[3] & (~SI4735_STATUS_PILOT));
_rsqm.MULT = _response[6];
_rsqm.FREQOFF = _response[7];
RSQ->PILOT = _response[3] & SI4735_STATUS_PILOT;
RSQ->STBLEND = (_response[3] & (~SI4735_STATUS_PILOT));
RSQ->MULT = _response[6];
RSQ->FREQOFF = _response[7];
}

*RSQ = _rsqm;
}

bool Si4735::volumeUp(void){
Expand Down
1 change: 0 additions & 1 deletion Si4735.h
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,6 @@ class Si4735
_pinSEN;
byte _mode, _response[16], _i2caddr;
bool _haverds;
Si4735_RX_Metrics _rsqm;

/*
* Description:
Expand Down

0 comments on commit 9bea6fb

Please sign in to comment.