Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into AX25_FM

Browse source
This commit is contained in:
Jonathan Naylor 2020-08-14 09:34:30 +01:00
parent 739550885b f71c8ce7bc
commit d5bbd77304
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Nextion.cpp
View file

@ -121,8 +121,8 @@ bool CNextion::open()
sendCommand("bkcmd=0");
sendCommandAction(0U);
m_fl_txFrequency = float(m_txFrequency) / 1000000.0F;
m_fl_rxFrequency = float(m_rxFrequency) / 1000000.0F;
m_fl_txFrequency = double(m_txFrequency) / 1000000.0F;
m_fl_rxFrequency = double(m_rxFrequency) / 1000000.0F;
setIdle();
@ -152,11 +152,11 @@ void CNextion::setIdleInt()
sendCommand(command);
sendCommandAction(17U);
::sprintf(command, "t30.txt=\"%3.4f\"",m_fl_rxFrequency); // RX freq
::sprintf(command, "t30.txt=\"%3.6f\"",m_fl_rxFrequency); // RX freq
sendCommand(command);
sendCommandAction(20U);
::sprintf(command, "t32.txt=\"%3.4f\"",m_fl_txFrequency); // TX freq
::sprintf(command, "t32.txt=\"%3.6f\"",m_fl_txFrequency); // TX freq
sendCommand(command);
sendCommandAction(21U);

4
Nextion.h
View file

@ -100,8 +100,8 @@ private:
unsigned int m_berCount2;
unsigned int m_txFrequency;
unsigned int m_rxFrequency;
float m_fl_txFrequency;
float m_fl_rxFrequency;
double m_fl_txFrequency;
double m_fl_rxFrequency;
bool m_displayTempInF;
std::string m_location;