remove flash operation debug messages to save on code space; reword some other debug messages;

usb-support
Bryan Biedenkapp 3 years ago
parent db39b8fe31
commit 28e55378fa

@ -135,6 +135,7 @@ void IO::process()
if (m_cwIdState) { if (m_cwIdState) {
// check for CW ID end of transmission // check for CW ID end of transmission
m_cwIdState = false; m_cwIdState = false;
DEBUG2("IO::process(): setting modem state", m_modemState);
io.rf1Conf(m_modemState, true); io.rf1Conf(m_modemState, true);
} }
@ -229,10 +230,10 @@ void IO::setMode(DVM_STATE modemState)
relativeState = serial.calRelativeState(modemState); relativeState = serial.calRelativeState(modemState);
} }
DEBUG3("IO::setMode(): setting RF hardware", modemState, relativeState); DEBUG3("IO::setMode(): setting modem state", modemState, relativeState);
rf1Conf(relativeState, true); rf1Conf(relativeState, true);
DEBUG4("IO::setMode(): setting lights", relativeState == STATE_DMR, relativeState == STATE_P25, relativeState == STATE_NXDN);
setDMRInt(relativeState == STATE_DMR); setDMRInt(relativeState == STATE_DMR);
setP25Int(relativeState == STATE_P25); setP25Int(relativeState == STATE_P25);
setNXDNInt(relativeState == STATE_NXDN); setNXDNInt(relativeState == STATE_NXDN);

@ -236,6 +236,7 @@ void SerialPort::process()
if (m_modemState == STATE_IDLE) { if (m_modemState == STATE_IDLE) {
m_cwIdState = true; m_cwIdState = true;
DEBUG2("SerialPort: process(): setting modem state", STATE_CW);
io.rf1Conf(STATE_CW, true); io.rf1Conf(STATE_CW, true);
err = cwIdTX.write(m_buffer + 3U, m_len - 3U); err = cwIdTX.write(m_buffer + 3U, m_len - 3U);

@ -217,8 +217,6 @@ void SerialPort::flashRead()
::memcpy(reply + 3U, (void*)STM32_CNF_PAGE, 246U); ::memcpy(reply + 3U, (void*)STM32_CNF_PAGE, 246U);
DEBUG1("SerialPort: flashRead(): read bytes from flash");
writeInt(1U, reply, 249U); writeInt(1U, reply, 249U);
} }
@ -233,19 +231,15 @@ uint8_t SerialPort::flashWrite(const uint8_t* data, uint8_t length)
return RSN_FLASH_WRITE_TOO_BIG; return RSN_FLASH_WRITE_TOO_BIG;
} }
DEBUG1("SerialPort: flashWrite(): unlocking flash");
FLASH_Unlock(); FLASH_Unlock();
FLASH_ClearFlag(FLASH_FLAG_BSY | FLASH_FLAG_EOP | FLASH_FLAG_PGERR | FLASH_FLAG_WRPRTERR); FLASH_ClearFlag(FLASH_FLAG_BSY | FLASH_FLAG_EOP | FLASH_FLAG_PGERR | FLASH_FLAG_WRPRTERR);
#if defined(STM32F4XX) #if defined(STM32F4XX)
DEBUG1("SerialPort: flashWrite(): erasing flash sector");
if (FLASH_EraseSector(STM32_CNF_SECTOR, VoltageRange_3) != FLASH_COMPLETE) { if (FLASH_EraseSector(STM32_CNF_SECTOR, VoltageRange_3) != FLASH_COMPLETE) {
FLASH_Lock(); FLASH_Lock();
return RSN_FAILED_ERASE_FLASH; return RSN_FAILED_ERASE_FLASH;
} }
#elif defined(STM32F10X_MD) #elif defined(STM32F10X_MD)
DEBUG1("SerialPort: flashWrite(): erasing flash page");
if (FLASH_ErasePage(STM32_CNF_PAGE_ADDR) != FLASH_COMPLETE) { if (FLASH_ErasePage(STM32_CNF_PAGE_ADDR) != FLASH_COMPLETE) {
FLASH_Lock(); FLASH_Lock();
return RSN_FAILED_ERASE_FLASH; return RSN_FAILED_ERASE_FLASH;
@ -262,7 +256,6 @@ uint8_t SerialPort::flashWrite(const uint8_t* data, uint8_t length)
(data[i + 1] << 8) + (data[i + 1] << 8) +
(data[i + 0] << 0); (data[i + 0] << 0);
DEBUG3("SerialPort: flashWrite(): writing byte data", address, i);
if (FLASH_ProgramWord(address, word) == FLASH_COMPLETE) { if (FLASH_ProgramWord(address, word) == FLASH_COMPLETE) {
address += 4; address += 4;
i += 4; i += 4;
@ -273,7 +266,6 @@ uint8_t SerialPort::flashWrite(const uint8_t* data, uint8_t length)
} }
} }
DEBUG1("SerialPort: flashWrite(): finished writing, locking flash");
FLASH_Lock(); FLASH_Lock();
return RSN_OK; return RSN_OK;
} }

Loading…
Cancel
Save

Powered by TurnKey Linux.