Commit graph

2562 commits

Author SHA1 Message Date
Jonathan Naylor 040ea4a15c Regenerate the odd VW mode message after the header. 2020-09-24 13:47:31 +01:00
Jonathan Naylor d92d41b4fd
Merge pull request #639 from jg1uaa/oled-userdb
add UserDB display for OLED
2020-09-24 13:00:51 +01:00
SASANO Takayoshi e818d0f500 add UserDB display for OLED
To display UserDB on DMR mode, set Slot1=0 and Slot2=1 in [DMR Network]
section.
2020-09-24 18:58:10 +08:00
Jonathan Naylor c5ce304edb Merge branch 'master' into SimpleDMR 2020-09-22 15:55:13 +01:00
Jonathan Naylor ba476b6fec Use normal logging for UDPSocket. 2020-09-22 15:51:10 +01:00
Jonathan Naylor 83b92f98e7
Merge pull request #638 from jg1uaa/oled-userdb
Makefile.Pi.OLED revised
2020-09-22 07:58:36 +01:00
SASANO Takayoshi d77d44fd4b Makefile.Pi.OLED revised
- use system default compiler (cc/c++) instead of gcc/g++
- no need to link wiringPi library, remove -lwiringPi
2020-09-22 07:43:20 +08:00
Jonathan Naylor 6d313fce51 Merge branch 'SimpleDMR' into AX25_FM 2020-09-20 21:32:11 +01:00
Jonathan Naylor 5eabb93078 Fix Windows execution. 2020-09-20 21:31:32 +01:00
Jonathan Naylor b2ba671071 Fix Windows compilation. 2020-09-20 14:07:42 +01:00
Jonathan Naylor c2a1aeb581 Merge branch 'SimpleDMR' into AX25_FM 2020-09-08 10:11:38 +01:00
Jonathan Naylor 6d6fcc7f93 Merge branch 'master' into SimpleDMR 2020-09-08 10:11:15 +01:00
Jonathan Naylor 75652b04ae Ignore any incoming YSF options messages. 2020-09-08 10:10:25 +01:00
Jonathan Naylor 5a3c61644c Fix compilation. 2020-09-06 14:49:52 +01:00
Jonathan Naylor 90e7b58b92 Merge branch 'SimpleDMR' into AX25_FM 2020-09-06 14:30:26 +01:00
Jonathan Naylor 43f4cdf092 Make all of the other Makefiles use the system default compilers. 2020-09-06 14:29:29 +01:00
Jonathan Naylor 98b1e6478b Merge branch 'SimpleDMR' into AX25_FM 2020-09-06 14:27:55 +01:00
Jonathan Naylor 7d3e899104 Clean ups for IPv6. 2020-09-06 12:54:08 +01:00
Jonathan Naylor e45f0edec4 Merge branch 'ipv6' into SimpleDMR 2020-09-06 11:57:11 +01:00
Jonathan Naylor e935fc1085
Merge pull request #636 from jg1uaa/ipv6
UDPSocket renewal
2020-09-06 11:52:13 +01:00
SASANO Takayoshi f2543de3da fix CUDPSocket(port) constructor bug
constructor CUDPSocket(port) cannot create properly, fixed
2020-09-06 16:32:33 +09:00
SASANO Takayoshi 9856025923 rewrite for UDPSocket renewal 2020-09-06 15:52:46 +09:00
SASANO Takayoshi def0edbaca UDPSocket renewal (2)
introduced YSFClients code

	match_addr(addr1, addr2) -> match(addr1, addr2, IMT_ADDRESS_ONLY)
	isnone() -> isNone()
	open(sockaddr_storage&) added (this refers address family only)
2020-09-06 15:48:22 +09:00
SASANO Takayoshi 457be810a3 UDPSocket renewal
Currently there is six variations of (IPv4) UDPSocket.cpp.

- FMClients, NXDNClients, P25Clients, YSFClients(YSFParrot)
	use ::fprintf() for logging

- YSFClients(YSFReflector)
	use LogError() and LogInfo() for logging
	special open(string &bindaddr) function

- YSFClients(YSFGateway), DAPNETGateway
	use LogError() and LogInfo() for logging

- P25Clients, DMRGateway
	use LogError() for logging
	no LogInfo("Opening UDP port on") message

- NXDNClients
	use LogError() for logging
	no LogInfo("Opening UDP port on") message
	add #include <ifaddrs.h>

- MMDVMHost
	use LogError() for logging
	no LogInfo("Opening UDP port on") message
	no assert(!address.empty()) at constructor

to avoid explosion, commonized them.

	switch ::fprintf()/LogError by #define HAVE_LOG_H
	always display LogInfo("Opening UDP port on") message
	delete #include <ifaddrs.h>, this is not needed
	no assert(!address.empty()) at constructor

and to support YSFReflector, add multiple socket support.
default is #define UDP_SOCKET_MAX 1 so normally this feature is disabled.

added these functions.

	CUDPSocket()	(constructor without any parameters)
	open(index, af, addr, port)
	close(index)

CUDPSocket() means CUDPSocket(address = "", port = 0)
index selects socket, address and port is defined at open.

to have compatibility for old codes, these function works as

	CUDPSocket(addr, port)	store addr and port to index #0
	CUDPSocket(port)	store addr = "" and port to index #0
	open()		open with addr and port of index #0, AF_UNSPEC
	open(af)	open with addr and port of index #0, specified af
	close()		close *all* sockets

read/write operation is for all opened sockets.
2020-09-06 12:09:37 +09:00
Jonathan Naylor 2502ee94d7 Merge branch 'SimpleDMR' into AX25_FM 2020-09-03 12:10:01 +01:00
Jonathan Naylor 3de54f6dd8 Merge branch 'ipv6' into SimpleDMR 2020-09-03 11:43:42 +01:00
Jonathan Naylor 132fb62d56 Small cleanups. 2020-08-30 14:54:51 +01:00
Jonathan Naylor 2349520964 Remove the location information from the new config message. 2020-08-27 10:13:02 +01:00
Jonathan Naylor 01da0ded7f Remove the unused SHA256 functions. 2020-08-27 09:00:49 +01:00
Jonathan Naylor 98879b5c14 Reinstated the location field. 2020-08-26 12:13:34 +01:00
Jonathan Naylor a9c9ff6011 Changes for the simplified protocol. 2020-08-26 10:18:57 +01:00
Jonathan Naylor 66a17f4849 Simplify the Host to DMR Gateway protocol. 2020-08-26 09:29:11 +01:00
Jonathan Naylor d5bbd77304 Merge branch 'master' into AX25_FM 2020-08-14 09:34:30 +01:00
Jonathan Naylor f71c8ce7bc
Merge pull request #633 from on7lds/dev
change tx and rx frequency display precision (to reflect ini file significant figures)
2020-08-14 09:33:53 +01:00
ON7LDS 70d596fea4 change tx and rx frequency display precision (to reflect ini file significant figures) 2020-08-13 21:23:42 +02:00
Jonathan Naylor 739550885b Merge branch 'master' into AX25_FM 2020-08-10 14:31:53 +01:00
Jonathan Naylor cdf62f1601
Merge pull request #630 from stefansaraev/oled-buildfix
OLED: fix build after f070410f7 and c7fbeecc5
2020-08-10 14:30:25 +01:00
Stefan Saraev f48cfcc70c OLED: fix build after f070410f7 and c7fbeecc5
============================
Display.cpp: In static member function 'static CDisplay* CDisplay::createDisplay(const CConf&, CUMP*, CModem*)':
Display.cpp:645:128: error: invalid new-expression of abstract class type 'COLED'
  645 |   display = new COLED(type, brightness, invert, scroll, rotate, logosaver, conf.getDMRNetworkSlot1(), conf.getDMRNetworkSlot2());
      |                                                                                                                                ^
In file included from Display.cpp:39:
OLED.h:40:7: note:   because the following virtual functions are pure within 'COLED':
   40 | class COLED : public CDisplay
      |       ^~~~~
In file included from Display.cpp:19:
Display.h:105:15: note: 	'virtual void CDisplay::writeFusionInt(const char*, const char*, unsigned char, const char*, const char*)'
  105 |  virtual void writeFusionInt(const char* source, const char* dest, unsigned char dgid, const char* type, const char* origin) = 0;
============================
2020-08-10 16:26:07 +03:00
Sergei 1cc79413b7
Added a new address the id's list
A new address with the id's list format optimized for pistar as well. Extra spaces in the line were removed.
2020-08-10 15:36:12 +03:00
Jonathan Naylor 97a10c7e30 Merge branch 'master' into AX25_FM 2020-08-09 19:40:37 +01:00
Jonathan Naylor c7fbeecc50 Change the displays to show the DG-ID instead of the TO field for YSF. 2020-08-09 19:23:18 +01:00
Jonathan Naylor 82ea772269 Merge branch 'master' into AX25_FM 2020-08-09 15:09:46 +01:00
Jonathan Naylor f070410f7e Display and log the DG-ID in the Fusion mode. 2020-08-09 15:09:08 +01:00
Jonathan Naylor 8a6f14e6e6 Merge branch 'master' into AX25_FM 2020-08-05 15:00:23 +01:00
Jonathan Naylor b0d828123b
Merge pull request #624 from msraya/master
Remove DG-ID clear to zero in order to use DG-ID room switch in C4FM servers
2020-08-04 19:40:08 +01:00
msraya ffd90f6941 Remove DG-ID clear to zero 2020-08-04 18:03:50 +01:00
Manuel Sánchez Raya c21e325ddb
Merge pull request #1 from g4klx/master
Update fork to last version
2020-08-04 18:51:46 +02:00
Jonathan Naylor 3776ed2b1b Merge branch 'master' into AX25_FM 2020-08-04 10:39:23 +01:00
Jonathan Naylor c57a313677 Revert "YSF updated from msraya."
This reverts commit 7a1b71ecf5.
2020-08-04 10:34:18 +01:00
Jonathan Naylor 11c8403829 Merge branch 'master' into AX25_FM 2020-08-04 10:04:47 +01:00