Commit graph

2524 commits

Author SHA1 Message Date
Jonathan Naylor
bbaec30249 Remove unused member variable. 2016-05-17 19:47:18 +01:00
Jonathan Naylor
07e42df597 Merge pull request #73 from g0wfv/develop
Remove compiler warnings for YSFNetwork.cpp
2016-05-17 10:15:42 +01:00
Tony Corbett G0WFV
3d6bc71e27 Remove compiler warnings for YSFNetwork.cpp
In file included from YSFNetwork.cpp:20:0:
YSFNetwork.h: In constructor ‘CYSFNetwork::CYSFNetwork(const string&, unsigned int, const string&, bool)’:
YSFNetwork.h:54:17: warning: ‘CYSFNetwork::m_debug’ will be initialized after [-Wreorder]
  bool           m_debug;
                 ^
YSFNetwork.h:53:17: warning:   ‘std::string CYSFNetwork::m_callsign’ [-Wreorder]
  std::string    m_callsign;
                 ^
YSFNetwork.cpp:31:1: warning:   when initialized here [-Wreorder]
 CYSFNetwork::CYSFNetwork(const std::string& address, unsigned int port, const std::string& callsign, bool debug) :
 ^
2016-05-17 10:03:59 +01:00
Jonathan Naylor
7ad26a18f2 Set the FICH on received network data. 2016-05-17 06:30:59 +01:00
Jonathan Naylor
ac4d8af0d2 Fix end of RF transmission. 2016-05-17 06:13:09 +01:00
Jonathan Naylor
57d8faa07e Add the holdoff timers. 2016-05-16 22:07:18 +01:00
Jonathan Naylor
9ed2c00b0c First go at System Fusion networking. 2016-05-16 21:57:32 +01:00
Jonathan Naylor
1d5ed691c4 Remove the System Fusion parrot. 2016-05-16 18:28:24 +01:00
Jonathan Naylor
f8790d91a8 Delay opening the IPSC connection in error cases. 2016-05-16 18:08:10 +01:00
Jonathan Naylor
5cbfa2b331 Disable receiving of DMR slot 1 in DMO mode. 2016-05-16 17:27:56 +01:00
Jonathan Naylor
59ea7efa04 Merge pull request #71 from g0wfv/develop
Add [-v|--version] flag to command line
2016-05-15 15:14:40 +01:00
Tony Corbett G0WFV
2256b8d025 Add word version to output 2016-05-15 07:06:38 +01:00
Tony Corbett G0WFV
2723e0c842 Capture bad command line arguments 2016-05-15 06:59:09 +01:00
Tony Corbett G0WFV
db8adfcfe0 Clean up tabbing 2016-05-14 23:31:33 +01:00
Tony Corbett G0WFV
4d44936e14 Remove the version from STDERR messages and add -v | --version flag 2016-05-14 23:26:16 +01:00
Tony Corbett G0WFV
d772c76b6e Add VERSION to STDERR and log messages that output the string MMDVMHost
They now output the string MMDVMHost-yyymmdd

a) for completeness 

and;

b) to quickly output the version number by calling the host executable with no arguments so Kim can easily grab it for his dashboard.

I did think about a -v|--version argument, but this was much simpler for the purpose.
2016-05-14 21:31:17 +01:00
Jonathan Naylor
b343acf868 Merge pull request #70 from g0wfv/develop
Update DMRIds.dat
2016-05-14 18:11:55 +01:00
Tony Corbett G0WFV
0edb757a0e Add the header back into DMRIds.dat 2016-05-14 16:45:07 +01:00
Tony Corbett G0WFV
8dc0f23605 Update DMRIds.dat
DMR-MARC database as at 1500 on 14 May 16
2016-05-14 16:42:14 +01:00
Jonathan Naylor
80842738f9 Merge pull request #67 from g0wfv/develop
Attempt to solve one cause of "No reply from modem" loop
2016-05-14 11:53:25 +01:00
Tony Corbett G0WFV
0db3cf10e8 Attempt to solve one cause of "No reply from modem" loop
"err 101" (network unreachable - effectively cant get to the master because we've lost the network)

This needs trapping and handling properly to smooth the way it currently tries to send from the socket as quickly as it can (effectively every millisecond) until the network is restored,  then does the same for "Opening IPSC" every millisecond or less until the login either times out (in which case I've edited the code to tell it to retry!) or logs into the master successfully.

This error also causes the "no reply from modem loop, however this is now trapped in all cases if the firmware is read successfully by stopping the inactivity timer, allowing the software to continue reading the modem.

It works for this particular error, but others may need to test!
2016-05-14 11:39:56 +01:00
Jonathan Naylor
3ebebf7f1c Stop sending the CW Id after a DMR transmission. 2016-05-13 10:32:41 +01:00
Jonathan Naylor
ddfd705fff Merge pull request #66 from g0wfv/develop
Update HD44780 todo list
2016-05-12 20:14:54 +01:00
Tony Corbett G0WFV
191df10265 Update HD44780 todo list 2016-05-12 19:41:58 +01:00
Jonathan Naylor
d09b2fa30b Send the CW Id after a DMR transmission. 2016-05-12 18:04:50 +01:00
Jonathan Naylor
55010aaaf6 Clean up the YSF code a little more. 2016-05-12 17:44:08 +01:00
Jonathan Naylor
2701506c44 Revert "Off by one bug in the YSF VW mode FEC regeneration."
This reverts commit ec7017147f.
2016-05-12 17:37:01 +01:00
Jonathan Naylor
fe4abef34f Merge pull request #65 from g0wfv/develop
Simplified writeDMRInt/clearDMRInt / Added source & type icons to duplex code.
2016-05-12 17:02:26 +01:00
Tony Corbett G0WFV
635ab50aa5 Clean up and make good without threading
Threading of scrolling source and destination IDs to be revisited another time (hopefully by someone else who knows what they're doing!)
2016-05-12 16:32:27 +01:00
Tony Corbett G0WFV
bfe0bb389c Correct an error with printing DMR to top line of 4 line screens 2016-05-12 14:04:43 +01:00
Tony Corbett
0014e39be7 Commented the point at which I'd like to start a new thread 2016-05-12 12:45:12 +01:00
Tony Corbett G0WFV
d39b743687 Merged branch develop into develop 2016-05-12 12:35:58 +01:00
Tony Corbett
0afaf87713 Tidied up and uncommented test duplex flag
Need to look at threading the printing of the buffer to the LCD so it can scroll long strings without pausing (and stopping) the processing of other data.
2016-05-12 12:35:25 +01:00
Tony Corbett
6065488b3f Tidied up and uncommented test duplex flag 2016-05-12 12:32:19 +01:00
Tony Corbett G0WFV
2e7d305049 Merged branch master into develop 2016-05-12 09:55:40 +01:00
Tony Corbett
74eb55ae7e Major restructure of writeDMRInt / clearDMRInt 2016-05-12 09:53:42 +01:00
Jonathan Naylor
73ceca706c Fix setting of the MR value. 2016-05-12 09:27:30 +01:00
Jonathan Naylor
ec7017147f Off by one bug in the YSF VW mode FEC regeneration. 2016-05-12 09:19:19 +01:00
Tony Corbett
127438abbe More restructuring 2016-05-11 22:30:06 +01:00
Tony Corbett
ca4d534ff2 Code restructure to allow for something to come ... 2016-05-11 21:14:17 +01:00
Jonathan Naylor
e9ed871970 Merge pull request #64 from Giorgiofox/patch-5
Update HD44780.cpp
2016-05-11 19:00:58 +01:00
Giorgio Campiotti
41eaab8bf0 Update HD44780.cpp
Better color on "LISTENING" and more important, better formatting with 16x2 display: The TG with 4 digit (for example 2222) was not visualized correctly
2016-05-11 19:17:23 +02:00
Jonathan Naylor
b89ea2d535 Merge pull request #63 from g0wfv/develop
Added private call icon and changed the way (some of the) icons are handled and displayed
2016-05-11 15:56:03 +01:00
Tony Corbett
0ec32de111 Merge branch 'develop' of https://www.github.com/g0wfv/MMDVMHost into develop 2016-05-11 15:35:32 +01:00
Tony Corbett
956c191703 Add private call icon and change the way (some of) the icons are handled and displayed 2016-05-11 15:34:43 +01:00
Jonathan Naylor
8c74b2f7dc Merge pull request #61 from g0wfv/develop
Added custom char for talkgroup and icons for RF and network sources
2016-05-11 13:45:35 +01:00
Tony Corbett
a0d27d9461 Change source characters to icons and only display once 2016-05-11 13:22:28 +01:00
Tony Corbett
2b6d7cd20b Merge branch 'develop' of https://www.github.com/g0wfv/MMDVMHost into develop 2016-05-11 11:38:12 +01:00
Tony Corbett
734e0f5de3 Add TG custom char (reclaims 1 char on display\!) 2016-05-11 11:37:23 +01:00
Jonathan Naylor
54626d524f Merge pull request #60 from g0wfv/develop
Add custom characters in HD44780 code
2016-05-11 10:28:29 +01:00