third-party/HamShield
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

working DTMF

Browse Source
This commit is contained in:
Morgan Redfield
2018-06-24 17:12:04 -07:00
parent c340fef0b4
commit 24082d5a11
3 changed files with 36 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/HamShield.cpp
View File

@@ -983,7 +983,6 @@ void HamShield::enableDTMFReceive(){
tx_data = 0x1E3C;
HSwriteWord(devAddr, 0x79, tx_data);
HSwriteBitsW(devAddr, A1846S_DTMF_ENABLE_REG, 7, 8, 0x18);
HSwriteBitsW(devAddr, A1846S_DTMF_ENABLE_REG, A1846S_DTMF_ENABLE_BIT, 1, 1);
HSwriteBitsW(devAddr, A1846S_DTMF_ENABLE_REG, A18462_DTMF_DET_TIME_BIT, A18462_DTMF_DET_TIME_LEN, 24);
@@ -991,13 +990,13 @@ void HamShield::enableDTMFReceive(){
// idle time
HSwriteBitsW(devAddr, A1846S_DTMF_TIME_REG, A1846S_DTMF_IDLE_TIME_BIT, A1846S_DTMF_IDLE_TIME_LEN, 50);
HSreadWord(devAddr, 0x6F, radio_i2c_buf);
Serial.println(radio_i2c_buf[0]);
// tx time
HSwriteBitsW(devAddr, A1846S_DTMF_TIME_REG, A1846S_DUALTONE_TX_TIME_BIT, A1846S_DUALTONE_TX_TIME_LEN, 50);
HSwriteBitsW(devAddr, A1846S_DTMF_TIME_REG, A1846S_DUALTONE_TX_TIME_BIT, A1846S_DUALTONE_TX_TIME_LEN, 60);
HSwriteBitsW(devAddr, 0x57, 0, 1, 1); // send dtmf to speaker out
//HSwriteBitsW(devAddr, 0x57, 0, 1, 1); // send dtmf to speaker out
// turn on pre/de-emphasis
HSwriteBitsW(devAddr, A1846S_EMPH_FILTER_REG, A1846S_EMPH_FILTER_EN, 1, 1);
}
@@ -1038,7 +1037,7 @@ void HamShield::setDTMFCode(uint16_t code){
tone1 = 770*10;
} else if ((code >= 7 && code <= 9) || code == 0xC) {
tone1 = 852*10;
} else if (code >= 0xD) {
} else if (code >= 0xD || code == 0) {
tone1 = 941*10;
}

2
src/HamShield.h
View File

@@ -163,7 +163,7 @@
#define A1846S_SQ_OUT_SEL_BIT 7 // sq_out_sel
// Bitfields for A1846S_EMPH_FILTER_REG
#define A1846S_EMPH_FILTER_EN 3
#define A1846S_EMPH_FILTER_EN 7
// Bitfields for A1846S_FLAG_REG
#define A1846S_RXON_RF_FLAG_BIT 10 // 1 when rxon is enabled