KB8PMY
/
MMDVM_HS
mirror of https://github.com/juribeparada/MMDVM_HS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing some signed / unsigned

Browse Source
pull/32/head
Andy CA6JAU 8 years ago
parent 44b36684a6
commit 725c905da0
3 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File

62
ADF7021.cpp
Unescape View File

@ -33,7 +33,7 @@
volatile bool totx_request = false; volatile bool totx_request = false;
volatile bool torx_request = false; volatile bool torx_request = false;
volatile bool even = true; volatile bool even = true;
static uint32_t last_clk = 2; static uint32_t last_clk = 2U;
volatile uint32_t AD7021_control_word; volatile uint32_t AD7021_control_word;
@ -100,7 +100,7 @@ void Send_AD7021_control2(bool doSle)
uint16_t CIO::readRSSI() uint16_t CIO::readRSSI()
{ {
uint32_t AD7021_RB; uint32_t AD7021_RB;
uint16_t RB_word = 0; uint16_t RB_word = 0U;
int AD7021_counter; int AD7021_counter;
uint8_t RB_code, gain_code, gain_corr; uint8_t RB_code, gain_code, gain_corr;
@ -145,22 +145,22 @@ uint16_t CIO::readRSSI()
switch(gain_code) { switch(gain_code) {
case 0b1010: case 0b1010:
gain_corr = 0; gain_corr = 0U;
break; break;
case 0b0110: case 0b0110:
gain_corr = 24; gain_corr = 24U;
break; break;
case 0b0101: case 0b0101:
gain_corr = 38; gain_corr = 38U;
break; break;
case 0b0100: case 0b0100:
gain_corr = 58; gain_corr = 58U;
break; break;
case 0b0000: case 0b0000:
gain_corr = 86; gain_corr = 86U;
break; break;
default: default:
gain_corr = 0; gain_corr = 0U;
break; break;
} }
@ -173,12 +173,12 @@ void CIO::ifConf(MMDVM_STATE modemState, bool reset)
{ {
float divider; float divider;
uint32_t ADF7021_REG2 = 0; uint32_t ADF7021_REG2 = 0U;
uint32_t ADF7021_REG3 = 0; uint32_t ADF7021_REG3 = 0U;
uint32_t ADF7021_REG4 = 0; uint32_t ADF7021_REG4 = 0U;
uint32_t ADF7021_REG10 = 0; uint32_t ADF7021_REG10 = 0U;
uint32_t ADF7021_REG13 = 0; uint32_t ADF7021_REG13 = 0U;
uint32_t AFC_OFFSET = 0; int32_t AFC_OFFSET = 0;
if(modemState != STATE_CWID) if(modemState != STATE_CWID)
m_modemState_prev = modemState; m_modemState_prev = modemState;
@ -525,11 +525,11 @@ if(m_duplex && (modemState != STATE_CWID))
#if defined(DUPLEX) #if defined(DUPLEX)
void CIO::ifConf2(MMDVM_STATE modemState) void CIO::ifConf2(MMDVM_STATE modemState)
{ {
uint32_t ADF7021_REG2 = 0; uint32_t ADF7021_REG2 = 0U;
uint32_t ADF7021_REG3 = 0; uint32_t ADF7021_REG3 = 0U;
uint32_t ADF7021_REG4 = 0; uint32_t ADF7021_REG4 = 0U;
uint32_t ADF7021_REG10 = 0; uint32_t ADF7021_REG10 = 0U;
uint32_t ADF7021_REG13 = 0; uint32_t ADF7021_REG13 = 0U;
switch (modemState) { switch (modemState) {
case STATE_DSTAR: case STATE_DSTAR:
@ -717,7 +717,7 @@ void CIO::ifConf2(MMDVM_STATE modemState)
void CIO::interrupt() void CIO::interrupt()
{ {
uint8_t bit = 0; uint8_t bit = 0U;
if (!m_started) if (!m_started)
return; return;
@ -740,7 +740,7 @@ void CIO::interrupt()
} }
// we set the TX bit at TXD low, sampling of ADF7021 happens at rising clock // we set the TX bit at TXD low, sampling of ADF7021 happens at rising clock
if (m_tx && clk == 0) { if (m_tx && clk == 0U) {
m_txBuffer.get(bit, m_control); m_txBuffer.get(bit, m_control);
even = !even; even = !even;
@ -782,19 +782,19 @@ void CIO::interrupt()
} }
// we sample the RX bit at rising TXD clock edge, so TXD must be 1 and we are not in tx mode // we sample the RX bit at rising TXD clock edge, so TXD must be 1 and we are not in tx mode
if (!m_tx && clk == 1 && !m_duplex) { if (!m_tx && clk == 1U && !m_duplex) {
if(RXD_pin()) if(RXD_pin())
bit = 1; bit = 1U;
else else
bit = 0; bit = 0U;
m_rxBuffer.put(bit, m_control); m_rxBuffer.put(bit, m_control);
} }
if (torx_request == true && even == ADF7021_EVEN_BIT && m_tx && clk == 0) { if (torx_request == true && even == ADF7021_EVEN_BIT && m_tx && clk == 0U) {
// that is absolutely crucial in 4FSK, see datasheet: // that is absolutely crucial in 4FSK, see datasheet:
// enable sle after 1/4 tBit == 26uS when sending MSB (even == false) and clock is low // enable sle after 1/4 tBit == 26uS when sending MSB (even == false) and clock is low
delay_us(26); delay_us(26U);
// SLE Pulse, should be moved out of here into class method // SLE Pulse, should be moved out of here into class method
SLE_pin(HIGH); SLE_pin(HIGH);
@ -817,22 +817,22 @@ void CIO::interrupt()
m_modeTimerCnt++; m_modeTimerCnt++;
if(m_scanPauseCnt >= SCAN_PAUSE) if(m_scanPauseCnt >= SCAN_PAUSE)
m_scanPauseCnt = 0; m_scanPauseCnt = 0U;
if(m_scanPauseCnt != 0) if(m_scanPauseCnt != 0U)
m_scanPauseCnt++; m_scanPauseCnt++;
} }
#if defined(DUPLEX) #if defined(DUPLEX)
void CIO::interrupt2() void CIO::interrupt2()
{ {
uint8_t bit = 0; uint8_t bit = 0U;
if(m_duplex) { if(m_duplex) {
if(RXD2_pin()) if(RXD2_pin())
bit = 1; bit = 1U;
else else
bit = 0; bit = 0U;
m_rxBuffer.put(bit, m_control); m_rxBuffer.put(bit, m_control);
} }

24
IO.cpp
Unescape View File

@ -61,18 +61,18 @@ m_watchdog(0U)
selfTest(); selfTest();
m_modeTimerCnt = 0; m_modeTimerCnt = 0U;
} }
void CIO::selfTest() void CIO::selfTest()
{ {
bool ledValue = false; bool ledValue = false;
uint32_t ledCount = 0; uint32_t ledCount = 0U;
uint32_t blinks = 0; uint32_t blinks = 0U;
while(true) { while(true) {
ledCount++; ledCount++;
delay_us(1000); delay_us(1000U);
if(ledCount >= 125U) { if(ledCount >= 125U) {
ledCount = 0U; ledCount = 0U;
@ -89,7 +89,7 @@ void CIO::selfTest()
blinks++; blinks++;
if(blinks > 5) if(blinks > 5U)
break; break;
} }
} }
@ -141,7 +141,7 @@ void CIO::process()
if(m_modemState_prev == STATE_DSTAR) if(m_modemState_prev == STATE_DSTAR)
scantime = SCAN_TIME; scantime = SCAN_TIME;
else if(m_modemState_prev == STATE_DMR) else if(m_modemState_prev == STATE_DMR)
scantime = SCAN_TIME*2; scantime = SCAN_TIME * 2U;
else if(m_modemState_prev == STATE_YSF) else if(m_modemState_prev == STATE_YSF)
scantime = SCAN_TIME; scantime = SCAN_TIME;
else if(m_modemState_prev == STATE_P25) else if(m_modemState_prev == STATE_P25)
@ -152,9 +152,9 @@ void CIO::process()
scantime = SCAN_TIME; scantime = SCAN_TIME;
if(m_modeTimerCnt >= scantime) { if(m_modeTimerCnt >= scantime) {
m_modeTimerCnt = 0; m_modeTimerCnt = 0U;
if( (m_modemState == STATE_IDLE) && (m_scanPauseCnt == 0) && m_scanEnable && !m_cwid_state) { if( (m_modemState == STATE_IDLE) && (m_scanPauseCnt == 0U) && m_scanEnable && !m_cwid_state) {
m_scanPos = (m_scanPos + 1) % m_TotalModes; m_scanPos = (m_scanPos + 1U) % m_TotalModes;
#if !defined(QUIET_MODE_LEDS) #if !defined(QUIET_MODE_LEDS)
setMode(m_Modes[m_scanPos]); setMode(m_Modes[m_scanPos]);
#endif #endif
@ -200,7 +200,7 @@ void CIO::process()
void CIO::start() void CIO::start()
{ {
m_TotalModes = 0; m_TotalModes = 0U;
if(m_dstarEnable) { if(m_dstarEnable) {
m_Modes[m_TotalModes] = STATE_DSTAR; m_Modes[m_TotalModes] = STATE_DSTAR;
@ -224,7 +224,7 @@ void CIO::start()
} }
#if defined(ENABLE_SCAN_MODE) #if defined(ENABLE_SCAN_MODE)
if(m_TotalModes > 1) if(m_TotalModes > 1U)
m_scanEnable = true; m_scanEnable = true;
else { else {
m_scanEnable = false; m_scanEnable = false;
@ -308,7 +308,7 @@ void CIO::setMode(MMDVM_STATE modemState)
void CIO::setDecode(bool dcd) void CIO::setDecode(bool dcd)
{ {
if (dcd != m_dcd) { if (dcd != m_dcd) {
m_scanPauseCnt = 1; m_scanPauseCnt = 1U;
COS_pin(dcd ? true : false); COS_pin(dcd ? true : false);
} }

18
SerialPort.cpp
Unescape View File

@ -317,17 +317,17 @@ uint8_t CSerialPort::setFreq(const uint8_t* data, uint8_t length)
// New MMDVMHost, set power from MMDVM.ini // New MMDVMHost, set power from MMDVM.ini
if (length == 10U) if (length == 10U)
rf_power = data[9]; rf_power = data[9U];
freq_rx = data[1] * 1; freq_rx = data[1U] * 1U;
freq_rx += data[2] * 256; freq_rx += data[2U] * 256U;
freq_rx += data[3] * 65536; freq_rx += data[3U] * 65536U;
freq_rx += data[4] * 16777216; freq_rx += data[4U] * 16777216U;
freq_tx = data[5] * 1; freq_tx = data[5U] * 1U;
freq_tx += data[6] * 256; freq_tx += data[6U] * 256U;
freq_tx += data[7] * 65536; freq_tx += data[7U] * 65536U;
freq_tx += data[8] * 16777216; freq_tx += data[8U] * 16777216U;
return io.setFreq(freq_rx, freq_tx, rf_power); return io.setFreq(freq_rx, freq_tx, rf_power);
} }

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.