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

whitespace fix

This commit is contained in:
Morgan Redfield 2018-08-08 18:50:30 -07:00
parent 88efafa0e2
commit 38f5a467ef
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/HamShield.cpp
View File

@ -681,25 +681,24 @@ uint16_t HamShield::getPABiasVoltage(){
// Subaudio settings // Subaudio settings
// recommended function for placing CTCSS tone on channel -- schedule remainder for deprecation // recommended function for placing CTCSS tone on channel
// ctcss freq encoder // ctcss freq encoder
void HamShield::setCtcssEncoder(float freq) { void HamShield::setCtcssEncoder(float freq) {
int dfreq = freq * 100; // Convert float into whole number (ctcss freq * 100) int dfreq = freq * 100; // Convert float into whole number (ctcss freq * 100)
setCtcssFreq(dfreq); // program CTCSS frequency buffer setCtcssFreq(dfreq); // program CTCSS frequency buffer
HSwriteBitW(devAddr, A1846S_CTCSS_FREQ_PRG, 10, 1); // program CTCSS frequency buffer into CTCSS encoder (step 1) HSwriteBitW(devAddr, A1846S_CTCSS_FREQ_PRG, 10, 1); // program CTCSS frequency buffer into CTCSS encoder (step 1)
HSwriteBitW(devAddr, A1846S_CTCSS_FREQ_PRG, 9, 1); // program CTCSS frequency buffer into CTCSS encoder (step 2) HSwriteBitW(devAddr, A1846S_CTCSS_FREQ_PRG, 9, 1); // program CTCSS frequency buffer into CTCSS encoder (step 2)
} }
// recommended function for detecting (and requiring) CTCSS to be on channel before audio is unmuted -- schedule remainder for deprecation // recommended function for detecting (and requiring) CTCSS to be on channel before audio is unmuted -- schedule remainder for deprecation
// ctcss freq decoder // ctcss freq decoder
void HamShield::setCtcssDecoder(float freq) { void HamShield::setCtcssDecoder(float freq) {
int dfreq = freq * 100; // Convert float into whole number (ctcss freq * 100) int dfreq = freq * 100; // Convert float into whole number (ctcss freq * 100)
setCtcssFreq(dfreq); // program CTCSS frequency buffer setCtcssFreq(dfreq); // program CTCSS frequency buffer
HSwriteBitW(devAddr, A1846S_CTCSS_FREQ_PRG, 10, 1); // program CTCSS frequency buffer into CTCSS encoder (step 1) HSwriteBitW(devAddr, A1846S_CTCSS_FREQ_PRG, 10, 1); // program CTCSS frequency buffer into CTCSS encoder (step 1)
HSwriteBitW(devAddr, A1846S_CTCSS_FREQ_PRG, 9, 1); // program CTCSS frequency buffer into CTCSS encoder (step 2) HSwriteBitW(devAddr, A1846S_CTCSS_FREQ_PRG, 9, 1); // program CTCSS frequency buffer into CTCSS encoder (step 2)
} }

8
src/HamShield.h
View File

@ -91,7 +91,7 @@
//#define A1846S_BAND_SEL_BIT 7 // band_sel<1:0> //#define A1846S_BAND_SEL_BIT 7 // band_sel<1:0>
//#define A1846S_BAND_SEL_LENGTH 2 //#define A1846S_BAND_SEL_LENGTH 2
// Bitfields for RDA1864_GPIO_MODE_REG // Bitfields for A1846_GPIO_MODE_REG
#define RDA1864_GPIO7_MODE_BIT 15 // <1:0> 00=hi-z,01=vox,10=low,11=hi #define RDA1864_GPIO7_MODE_BIT 15 // <1:0> 00=hi-z,01=vox,10=low,11=hi
#define RDA1864_GPIO7_MODE_LENGTH 2 #define RDA1864_GPIO7_MODE_LENGTH 2
#define RDA1864_GPIO6_MODE_BIT 13 // <1:0> 00=hi-z,01=sq or =sq&ctcss/cdcss when sq_out_sel=1,10=low,11=hi #define RDA1864_GPIO6_MODE_BIT 13 // <1:0> 00=hi-z,01=sq or =sq&ctcss/cdcss when sq_out_sel=1,10=low,11=hi
@ -283,11 +283,11 @@ class HamShield {
// Subaudio settings // Subaudio settings
// Recommended user function for setting and receiving CTCSS does // Recommended user function for setting and receiving CTCSS does
// TODO: set others to private and/or deprecate // TODO: set others to private and/or deprecate
void setCtcssEncoder(float freq); // generate sub audio tone on channel when transmitting void setCtcssEncoder(float freq); // generate sub audio tone on channel when transmitting
void setCtcssDecoder(float freq); // unmute audio on tone present when receiving channel void setCtcssDecoder(float freq); // unmute audio on tone present when receiving channel