From 622a5e24dbbaa85cd6d7a5fc629c4c8612d41959 Mon Sep 17 00:00:00 2001 From: phl0 Date: Fri, 2 Mar 2018 13:02:56 +0100 Subject: [PATCH 1/3] Use wiringPi instead of i2c --- Makefile.Pi.OLED | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.Pi.OLED b/Makefile.Pi.OLED index 4a6ab3bd7..18f906d0a 100644 --- 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 = \ From faa0bde50d088f5dc05b69fd0583fb08fedaa3ae Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Sat, 3 Mar 2018 17:14:02 -0300 Subject: [PATCH 2/3] Fix compilation error with abs() function using some compilers --- NXDNConvolution.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NXDNConvolution.cpp b/NXDNConvolution.cpp index 2784a428e..d74fe2a2e 100755 --- a/NXDNConvolution.cpp +++ b/NXDNConvolution.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include const unsigned char BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U}; From 87c54358a83c2d76c1e8456e70e67b790064f91d Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Thu, 8 Mar 2018 07:12:35 +0000 Subject: [PATCH 3/3] In simplex NXDN mode make the MMDVM look like another handset. --- NXDNControl.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/NXDNControl.cpp b/NXDNControl.cpp index 552f46ff7..69096151d 100644 --- a/NXDNControl.cpp +++ b/NXDNControl.cpp @@ -218,7 +218,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne CSync::addNXDNSync(data + 2U); CNXDNLICH lich = m_rfLastLICH; - 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); CNXDNSACCH sacch; @@ -386,7 +386,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); CNXDNSACCH sacch; @@ -423,7 +423,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne lich.setRFCT(NXDN_LICH_RFCT_RDCH); lich.setFCT(usc); 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); // Regenerate SACCH if it's valid @@ -570,7 +570,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); if (validUDCH) {