#8 Move sending of id frames to own function

F4FXL · Dec 31, 2021 · cb5797d · cb5797d
1 parent aecbc44
commit cb5797d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/APRSWriter.cpp b/APRSWriter.cpp
@@ -163,16 +163,8 @@ void CAPRSWriter::clock(unsigned int ms)
 
  if(m_idFrameProvider != nullptr) {
  m_idFrameProvider->clock(ms);
-
- if(m_idFrameProvider->wantsToSend() && m_thread->isConnected()) {
- for(auto entry : m_array) {
- std::vector<std::string> frames;
- if(m_idFrameProvider->buildAPRSFrames(m_gateway, entry.second, frames)) {
- for(auto frame : frames) {
- m_thread->write(frame.c_str());
- }
- }
- }
+ if(m_idFrameProvider->wantsToSend()) {
+ sendIdFrames();
  }
  }
 
@@ -182,6 +174,21 @@ void CAPRSWriter::clock(unsigned int ms)
  }
 }
 
+void CAPRSWriter::sendIdFrames()
+{
+ if(m_thread->isConnected())
+ {
+ for(auto entry : m_array) {
+ std::vector<std::string> frames;
+ if(m_idFrameProvider->buildAPRSFrames(m_gateway, entry.second, frames)) {
+ for(auto frame : frames) {
+ m_thread->write(frame.c_str());
+ }
+ }
+ }
+ }
+}
+
 bool CAPRSWriter::isConnected() const
 {
  return m_thread->isConnected();

diff --git a/APRSWriter.h b/APRSWriter.h
@@ -65,7 +65,7 @@ class CAPRSWriter {
  std::unordered_map<std::string,CAPRSEntry *> m_array;
  CAPRSIdFrameProvider * m_idFrameProvider;
 
- void sendIdFramesMobile();
+ void sendIdFrames();
 };
 
 #endif