Add cbSendPacketToInstrument wrapper and remove many #ifdef CBPROTO_311

CerebusOSS · Sep 5, 2023 · 3743dd8 · 3743dd8
1 parent 453c640
commit 3743dd8
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 176 deletions.
diff --git a/cbhwlib/InstNetwork.cpp b/cbhwlib/InstNetwork.cpp
@@ -581,10 +581,7 @@ void InstNetwork::timerEvent(QTimerEvent * /*event*/)
             pktgeneric.cbpkt_header.chid = 0x8000;
             pktgeneric.cbpkt_header.type = cbPKTTYPE_REQCONFIGALL;
             pktgeneric.cbpkt_header.dlen = 0;
-#ifndef CBPROTO_311
-            pktgeneric.cbpkt_header.instrument = 0;
-#endif
-            cbSendPacket(&pktgeneric, m_nInstance);
+            cbSendPacketToInstrument(&pktgeneric, m_nInstance, 0);
         }
         // at 2.0 seconds, if not already running, do soft reset, which will lead to running state.
         else if (m_timerTicks == 200)