Merge branch 'master' into icom

g4klx · Mar 8, 2018 · 6d5a1e0 · 6d5a1e0
2 parents aac677d + 87c5435
commit 6d5a1e0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Makefile.Pi.OLED b/Makefile.Pi.OLED
@@ -3,7 +3,7 @@
 CC      = gcc
 CXX     = g++
 CFLAGS  = -g -O3 -Wall -std=c++0x -pthread -DOLED -I/usr/local/include
-LIBS    = -lArduiPi_OLED -li2c -lpthread
+LIBS    = -lArduiPi_OLED -lwiringPi -lpthread
 LDFLAGS = -g -L/usr/local/lib
 
 OBJECTS = \

diff --git a/NXDNControl.cpp b/NXDNControl.cpp
@@ -224,7 +224,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
 		lich.setRFCT(NXDN_LICH_RFCT_RDCH);
 		lich.setFCT(NXDN_LICH_USC_SACCH_NS);
 		lich.setOption(NXDN_LICH_STEAL_FACCH);
-		lich.setDirection(m_remoteGateway ? NXDN_LICH_DIRECTION_INBOUND : NXDN_LICH_DIRECTION_OUTBOUND);
+		lich.setDirection(m_remoteGateway || !m_duplex ? NXDN_LICH_DIRECTION_INBOUND : NXDN_LICH_DIRECTION_OUTBOUND);
 		lich.encode(data + 2U);
 
 		netData[0U] = lich.getRaw();
@@ -399,7 +399,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
 			lich.setRFCT(NXDN_LICH_RFCT_RDCH);
 			lich.setFCT(NXDN_LICH_USC_SACCH_NS);
 			lich.setOption(NXDN_LICH_STEAL_FACCH);
-			lich.setDirection(m_remoteGateway ? NXDN_LICH_DIRECTION_INBOUND : NXDN_LICH_DIRECTION_OUTBOUND);
+			lich.setDirection(m_remoteGateway || !m_duplex ? NXDN_LICH_DIRECTION_INBOUND : NXDN_LICH_DIRECTION_OUTBOUND);
 			lich.encode(start + 2U);
 
 			netData[0U] = lich.getRaw();
@@ -443,7 +443,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
 		lich.setRFCT(NXDN_LICH_RFCT_RDCH);
 		lich.setFCT(NXDN_LICH_USC_SACCH_SS);
 		lich.setOption(option);
-		lich.setDirection(m_remoteGateway ? NXDN_LICH_DIRECTION_INBOUND : NXDN_LICH_DIRECTION_OUTBOUND);
+		lich.setDirection(m_remoteGateway || !m_duplex ? NXDN_LICH_DIRECTION_INBOUND : NXDN_LICH_DIRECTION_OUTBOUND);
 		lich.encode(data + 2U);
 
 		netData[0U] = lich.getRaw();
@@ -611,7 +611,7 @@ bool CNXDNControl::processData(unsigned char option, unsigned char *data)
 	lich.setRFCT(NXDN_LICH_RFCT_RDCH);
 	lich.setFCT(NXDN_LICH_USC_UDCH);
 	lich.setOption(option);
-	lich.setDirection(m_remoteGateway ? NXDN_LICH_DIRECTION_INBOUND : NXDN_LICH_DIRECTION_OUTBOUND);
+	lich.setDirection(m_remoteGateway || !m_duplex ? NXDN_LICH_DIRECTION_INBOUND : NXDN_LICH_DIRECTION_OUTBOUND);
 	lich.encode(data + 2U);
 
 	netData[0U] = lich.getRaw();
@@ -723,7 +723,7 @@ void CNXDNControl::writeNetwork()
 	lich.setRaw(netData[0U]);
 	unsigned char usc    = lich.getFCT();
 	unsigned char option = lich.getOption();
-	lich.setDirection(m_remoteGateway ? NXDN_LICH_DIRECTION_INBOUND : NXDN_LICH_DIRECTION_OUTBOUND);
+	lich.setDirection(m_remoteGateway || !m_duplex ? NXDN_LICH_DIRECTION_INBOUND : NXDN_LICH_DIRECTION_OUTBOUND);
 	lich.encode(data + 2U);
 
 	if (usc == NXDN_LICH_USC_UDCH) {
@@ -878,7 +878,7 @@ void CNXDNControl::writeNetwork()
 			lich.setRFCT(NXDN_LICH_RFCT_RDCH);
 			lich.setFCT(NXDN_LICH_USC_SACCH_NS);
 			lich.setOption(NXDN_LICH_STEAL_FACCH);
-			lich.setDirection(m_remoteGateway ? NXDN_LICH_DIRECTION_INBOUND : NXDN_LICH_DIRECTION_OUTBOUND);
+			lich.setDirection(m_remoteGateway || !m_duplex ? NXDN_LICH_DIRECTION_INBOUND : NXDN_LICH_DIRECTION_OUTBOUND);
 			lich.encode(start + 2U);
 
 			CNXDNSACCH sacch;

diff --git a/NXDNConvolution.cpp b/NXDNConvolution.cpp
@@ -21,7 +21,7 @@
 #include <cstdio>
 #include <cassert>
 #include <cstring>
-#include <cmath>
+#include <cstdlib>
 
 const unsigned char BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U};