Commit graph

253 commits

Author SHA1 Message Date
phl0
ecc97aaab7
Minor code beauty 2018-09-14 23:15:50 +02:00
Luca Marchesano
f978a91519
Add select ack message dstar
AckMessage = 0 set BER status
AckMessage = 1 set RSSI status
2018-09-14 12:30:48 +02:00
KD4Z
ca35121b44 Add more dynamic variables and fix command manging
Add variables for TX Freq (t30), RX Freq (t32), CPU Temp (t20), and
Location (t31) to Base MMDVM page.   These variables are available with
Layout ON7LDS L3 or higher.  This allows more dynamic info to be
displayed without having to use the optional NextionDriver.  Note, this
doesn't add touch support. For that, use the NextionDriver.
Fixed command mangling occuring during serial writes to Nextion due to
no ready-state monitoring of display readiness.   Added simple thread
sleep to pace the commands as they are sent.  Allows the display a
chance to process the command before another one is blasted in.
Prevents mangling of commands sent before display is ready to accept
them.   Hardwired to 10 msec--let's see if that's enough.
Added setting in mmdvm conf file, Section: [Nextion]  Setting:
DisplayTempInFahrenheit   Value= 0 (default) for C.  1=Fahrenheit  This
controls the value sent to t20.
2018-09-05 16:12:12 -04:00
root
86fb3b6944 New option SendFrameType so one can send transparent data also to the modem serial port.
If set, one then has to specify the frame type (0x80 for modem serial of 0x90 for transparent data) as first byte af the message.
2018-08-13 20:39:16 +02:00
Hootie81
40db88d5f8 modified: Conf.cpp
modified:   Conf.h
	modified:   MMDVMHost.cpp
	modified:   Modem.cpp
	modified:   Modem.h
	modified:   SerialController.cpp
	modified:   SerialController.h
2018-07-19 13:09:00 +00:00
Jonathan Naylor
d49c679b46 Merge branch 'master' into pocsag 2018-07-04 19:01:24 +01:00
Andy CA6JAU
7bf82085c2 Fix DMR jitter default var value 2018-07-03 13:28:54 -04:00
Jonathan Naylor
413a44e088 Add the POCSAG frequency to the modem protocol (for hotspots). 2018-06-12 19:40:49 +01:00
Jonathan Naylor
2a0364a6d4 nitial commit of POCSAG files. 2018-06-07 18:46:03 +01:00
Jonathan Naylor
31beeee604 Add the YSF TX hang parameter. 2018-05-21 21:32:33 +01:00
Jonathan Naylor
a50854d67a Make DGID an alias of DSQ for YSF. 2018-03-29 07:50:57 +01:00
Jonathan Naylor
48300c0aa8 Merge branch 'master' into icom 2018-03-22 07:14:09 +00:00
Jonathan Naylor
52ec2f205c Add modem transparent modem data mode. Not used on the MMDVM currently. 2018-03-22 07:13:13 +00:00
Jonathan Naylor
98a31e8d20 Allow more control over NXDN networking. 2018-03-12 20:55:53 +00:00
Jonathan Naylor
12cfaec1f6 Align the networking with NXCore. 2018-03-01 20:28:43 +00:00
Jonathan Naylor
635a774c83 Merge branch 'master' into nxdn 2018-02-08 20:50:18 +00:00
Jonathan Naylor
e6ed2e17a1 Roll back the jitter buffer changes. 2018-02-08 20:25:03 +00:00
Jonathan Naylor
0e804b7390 Merge branch 'master' into nxdn 2018-02-08 18:31:05 +00:00
Jonathan Naylor
e82a6d8bb7 Bring DMR into line by default with the other modes. 2018-02-08 18:30:16 +00:00
Stefan Saraev
a2b5804ff4 [dmr] make jitterbuffer disabled by default 2018-02-07 21:27:58 +02:00
Jonathan Naylor
3858cf4aec Merge branch 'master' into nxdn 2018-02-01 06:59:46 +00:00
Jonathan Naylor
43fdb770a9 Make the jitter buffer switchable. 2018-02-01 06:59:11 +00:00
Jonathan Naylor
5a494b5536 Merge branch 'master' into nxdn 2018-01-29 23:09:21 +00:00
Jonathan Naylor
b694f85461 Remove quotes from config values if found. 2018-01-29 23:08:48 +00:00
Jonathan Naylor
5291a6427c Add more NXDN support files. 2018-01-17 21:21:25 +00:00
Jonathan Naylor
8fa4779ca9 Merge branch 'master' into nxdn 2018-01-16 20:14:57 +00:00
Jonathan Naylor
323179d525 Add more DMR beacon parameters. 2018-01-16 18:35:29 +00:00
Jonathan Naylor
10b0d3c14c Merge branch 'master' into nxdn 2018-01-15 21:12:56 +00:00
Jonathan Naylor
712cfc89c6 Add basic NXDN networking. 2018-01-15 21:03:34 +00:00
Jonathan Naylor
d3395278c6 Add locally timed DMR roaming beacons. 2018-01-15 19:22:01 +00:00
Jonathan Naylor
daa42e266a Make 1 the default NXDN RAN. 2018-01-11 21:59:31 +00:00
Jonathan Naylor
b2586654a2 Initial commit of NXDN scaffolding. 2018-01-11 19:35:33 +00:00
Andy CA6JAU
1805a98f72 RF power level control for MMDVM_HS compatible devices 2017-12-30 12:05:11 -03:00
ON7LDS
3b62bd1666 New Nextion screen layout with better looking fonts
New parameter for selecting ON7LDS Nextion screen layout
The active ip address of the host is showed on main screen
Nextion DMR page:
* Talker alias (if available) will be decoded and displayed (in green to know it's the TA)
* Font will get smaller if TA is to long
GPS data will be decoded and logged
2017-11-13 21:48:47 +01:00
phl0
ecb4ea1a38
Rename config file values (acc. to #ee93e4ce) 2017-11-09 23:17:25 +01:00
Jonathan Naylor
85e90610d7 Add remote gateway modes to D-Star and P25. 2017-11-09 09:21:22 +00:00
Jonathan Naylor
066e5f0270 Add the optional RX DC Offset parameter. 2017-10-28 12:37:32 +01:00
Jonathan Naylor
31828da9d2 Allow for per mode RF and Network mode hang times. 2017-09-01 09:25:54 +01:00
Jonathan Naylor
9a7828566d Add an optional transmi DC offset value. 2017-08-20 12:07:57 +01:00
Jonathan Naylor
fda4049928 Move the Id into the General section. 2017-08-19 16:23:37 +01:00
Jonathan Naylor
23ce9c7b46 Merge branch 'YSFRefactor' 2017-08-19 12:12:05 +01:00
Jonathan Naylor
cf0c70087d Add SelfOnly to P25 based on the DMR Id. 2017-08-15 10:30:05 +01:00
Jonathan Naylor
8b2544ba85 Add SelfOnly to YSF. 2017-08-15 10:11:05 +01:00
Jonathan Naylor
3749b8d9f4 Add configurable scrolling to the OLED display. 2017-08-13 10:57:02 +01:00
Jonathan Naylor
8d9cfb0f46 Add YSF DSQ support. 2017-08-13 10:30:02 +01:00
Jonathan Naylor
194b543b32 Merge pull request #313 from phl0/makeAckTimeAdjustable
Make AckTime adjustable
2017-06-16 08:27:18 +01:00
phl0
a09587ed26
Use correct parameter for Timers 2017-06-16 08:58:30 +02:00
g0wfv
5e91c1159f Add Tx and Rx frequency offsets
Enables specification of independant Tx and Rx offsets in Hz for Tx and Rx frequencies on DVMega and MMDVM_HS hardware.

Tx and Rx frequencies no longer have to be offset for frequency errors in ADF7021 devices and dashboards (BM/DMR+) will now display intended frequencies.
2017-06-14 16:46:00 +01:00
phl0
f0fc7c7ec9
Make AckTime adjustable 2017-06-14 12:54:44 +02:00
Jonathan Naylor
043ffe96d9 Make the D-Star ack optional. 2017-06-10 13:18:18 +01:00
Jonathan Naylor
ce9be0ee5e Fix compiler warnings. 2017-06-02 16:39:23 +01:00
Jonathan Naylor
c1521ee445 Allow the MMDVM levels to be specified as floating point values. 2017-06-02 16:34:55 +01:00
Jonathan Naylor
9ac4919a4c Move modem tracing to Trace and add a new modem Debug function. 2017-04-14 14:05:30 +01:00
Jonathan Naylor
0fe100b01c Fix some indentation. 2017-04-11 19:26:44 +01:00
Jonathan Naylor
99d57bf102 Allow for optional seperate (and longer) CW Ids. 2017-04-10 17:55:53 +01:00
Jonathan Naylor
dd2db36409 Remove unused sample dumping code. 2017-04-10 17:54:12 +01:00
Jonathan Naylor
c0571edb0b Modify the P25 UID check slightly. 2017-03-29 20:46:27 +01:00
Ryan Butler
aae96a1caf This adds the ability to override the UID checking in P25 code to force 7 digit IDs.
Jonathan added this code due to a lack of CRC on P25 checking but some parties desire the ability to have any id.

It's understood that on networked connections, the need to use a 7 digit unique ID like the DMR ID is necessary.

This change is affected by adding a new parameter to the [P25 Network] section called OverrideUIDCheck and it defaults to 0.

The logic is, if the network is enabled, or if the network is disabled and the override is disabled, the check is made, otherwise it is not.

This has been field tested for all 4 configuration cases and found to work as described above.
2017-03-29 10:18:54 -05:00
Jonathan Naylor
1a6f282782 Add YSF low deviation mode. 2017-03-23 20:26:17 +00:00
Jonathan Naylor
f3a589ce56 Remove compiler warning. 2017-03-08 13:01:59 +00:00
Jonathan Naylor
d51b7261cf Remove the OscOffset parameter. 2017-03-07 20:38:06 +00:00
Jonathan Naylor
1dbaec9331 Increase TA and GPS to message level, and allow it to be controlled from
the ini file.
2017-02-27 20:17:55 +00:00
Jonathan Naylor
fc477d9abf Add full frame file dumping. 2017-02-20 21:36:35 +00:00
Jonathan Naylor
ac22f0b783 Add an optional error reply for D-Star. 2017-02-16 19:49:58 +00:00
phl0
8ffdb9bd20
Optional non Embedded LC data suppression 2017-01-16 13:10:23 +01:00
Jonathan Naylor
af721f89e2 Add RSSI display for all modes. 2017-01-05 19:15:10 +00:00
Jonathan Naylor
aac48cb58f Use a linear interpolator for the reported RSSI values. 2016-12-21 19:58:46 +00:00
Jonathan Naylor
59080e1bd7 Complete the restructuring of the DMR access control. 2016-12-21 19:06:29 +00:00
Jonathan Naylor
a28508b8b1 Initial removal of TG rewrite code. 2016-12-21 18:06:43 +00:00
Jonathan Naylor
b69336dca1 Clean up the OLED configuration. 2016-11-03 21:43:29 +00:00
Jonathan Naylor
34538d8b3f Add the optional DMR network options command. 2016-11-03 19:27:52 +00:00
Jonathan Naylor
015896a299 Add the host support for the UMP. 2016-11-03 19:07:44 +00:00
Tony Corbett G0WFV
44e8f6717a LCDproc: Make dimming the status screen optional
If you run another LCDproc client that doesn't dim the display when it displays its info, the display will effectively flash on and off (or dim/bright depending on your LCDd configuration) as it switches screens between MMDVMHost and the other client(s).

Making the dimming optional and turning it off in the host stops this "annoyance".
2016-10-29 22:07:54 +03:00
Tony Corbett G0WFV
655de17cdd Fix typo in MMDVM.ini [LCDproc] section and mend Conf.cpp accordingly 2016-10-29 11:28:56 +01:00
Tony Corbett G0WFV
627e4f1dc3 Initial LCDproc support 2016-10-28 13:22:20 +01:00
Jonathan Naylor
40c086bad8 Load the DMR Id lookup table periodically. 2016-10-10 19:15:30 +01:00
Jonathan Naylor
878b4d6d73 Add controls for the CW Id level. 2016-10-10 17:46:37 +01:00
Jonathan Naylor
73cd839b24 Disable all formats by default. 2016-09-30 11:41:56 +01:00
phl0
157bc8c058
Disable networks by default or if missing in MMDVM.ini 2016-09-29 13:09:02 +02:00
Jonathan Naylor
25cfff3ada Merge branch 'master' into P25 2016-09-27 19:47:07 +01:00
Jonathan Naylor
9408367a0f Allow for remote System Fusion gateway operation. 2016-09-26 18:07:06 +01:00
Simon
dfb3630315 Tidy up as per Jonathan's comments 2016-09-22 16:47:04 +01:00
Simon
e87eae94a1 Next release of TG Rewrite 2016-09-21 19:35:13 +01:00
Simon
65bdc54997 Adding ini options for TGRewrite code 2016-09-21 16:33:35 +01:00
Simon
90bad8d9c8 wip 2016-09-19 13:39:51 +01:00
Simon
ec1692608d Conf options 2016-09-19 12:54:41 +01:00
Simon
0fa117969e Added separate config section for DMR TG Rewrite 2016-09-18 21:59:05 +01:00
Simon
b6f4842b7f Completed TG Rewrite, added config options. 2016-09-15 20:41:14 +01:00
Jonathan Naylor
34e0d10343 A semi-working P25 repeater without much FEC. 2016-09-12 23:26:05 +01:00
Jonathan Naylor
434cee8ce0 Merge branch 'master' into P25 2016-09-10 14:58:41 +01:00
Jonathan Naylor
dc2028dd6a Start full host support got P25. 2016-09-08 18:38:59 +01:00
Jonathan Naylor
e04d76584e Configurable DMR jitter buffer. 2016-09-06 19:42:15 +01:00
Jonathan Naylor
f1f69bb4ee Add independent mode output levels. 2016-08-09 07:08:37 +01:00
Jonathan Naylor
059b960959 Add RSSI reporting for DMR only. 2016-08-08 21:26:18 +01:00
Simon
53fe88bf9e Add separate blacklist/whitelist for RF and NET 2016-07-10 21:37:11 +01:00
Jonathan Naylor
25dddc18f4 Remove the level adjustments. 2016-07-07 17:40:41 +01:00
Tony Corbett G0WFV
f212c47882 Import address as hex value 2016-06-30 21:55:02 +01:00
Tony Corbett G0WFV
8801355ace Change incorrect variable type to unsigned int 2016-06-30 20:35:32 +01:00
Tony Corbett G0WFV
2b5c66ca85 Fix schoolboy error 2016-06-30 20:16:29 +01:00
Tony Corbett G0WFV
ce367f73cb Make I2C address configurable for HD44780 LCD variations
Also add a basic README with some pointers on how to connect and configure the LCDs
2016-06-30 20:10:30 +01:00
Tony Corbett G0WFV
da53f06197 Time/date format by system locale (HD44780 & Nextion) 2016-06-24 16:08:28 +01:00
Jonathan Naylor
6745168688 Make the Nextion idle brightness level configurable. 2016-06-24 10:33:28 +01:00
phl0
6628a613e8
Merge remote-tracking branch 'upstream/master' into DimOnIdle 2016-06-24 10:14:38 +02:00
phl0
7e906f3fdd
Add Config option to dim Nextion display in idle
state
2016-06-24 09:30:46 +02:00
Jonathan Naylor
10e3a85691 Add seperate RF and Network mode timeouts. 2016-06-22 18:03:56 +01:00
phl0
3b09e2cf2f
Renamed English to British and added American (MDY) 2016-06-22 14:13:22 +02:00
phl0
3f4f4d340d
Add missing function to read config value 2016-06-22 12:41:25 +02:00
phl0
528a220afb
Add date separator settings for HD44780 to Conf 2016-06-22 12:14:22 +02:00
phl0
2bd75c1cff
Add dot as date separator 2016-06-22 11:51:41 +02:00
Jonathan Naylor
768e3efcad Add fine adjustments to DMR/YSF thresholds. 2016-06-21 07:26:11 +01:00
Jonathan Naylor
9240550de6 Allow for the fine adjustment of levels. 2016-06-20 22:04:44 +01:00
Jonathan Naylor
8af3016583 Add a DMR hang time for locking out disimilar calls. 2016-06-16 21:40:05 +01:00
Simon
139f62f57e Merge remote-tracking branch 'upstream/master' 2016-06-10 09:58:31 +01:00
Jonathan Naylor
ee93e4ce43 Rename config file values. 2016-06-08 06:10:51 +01:00
Jonathan Naylor
5a2c569887 Updates to support the YSF Reflector. 2016-06-07 21:17:57 +01:00
Simon
fcc3902e8f Blacklist/whitelist stuff 2016-06-07 19:09:00 +01:00
Simon
5d9be0368c Merge remote-tracking branch 'upstream/master' 2016-06-07 15:35:08 +01:00
Simon
03c938a782 Added whitelist and blacklist config 2016-06-07 15:33:17 +01:00
Jonathan Naylor
dad34ada69 Add the idle clock to the Nextion display. 2016-06-01 11:55:24 +01:00
Tony Corbett
35c0a83d37 Add a clock to the idle screen 2016-05-28 23:29:30 +03:00
Jonathan Naylor
d474328c58 Modify the 3.5" Nextion display to make it the same as the others. 2016-05-23 18:36:53 +01:00
Jonathan Naylor
1d5ed691c4 Remove the System Fusion parrot. 2016-05-16 18:28:24 +01:00
Rudy Hardeman
426a6dcf6b Merge branch 'master' of https://github.com/g4klx/MMDVMHost into SSD1306 2016-05-10 15:33:24 +00:00
Rudy Hardeman
7271ac0766 Initial version
DMR works
2016-05-10 15:08:06 +00:00
Jonathan Naylor
68d58a3de6 Add the CW Id. 2016-05-09 21:55:44 +01:00
Jonathan Naylor
ed6586fa58 Split the DMR TX hang time from the mode hang time. 2016-05-05 17:56:18 +01:00
Jonathan Naylor
dd5e86a66d Use the duplex flag to indicate that a DVMega is being used. 2016-05-05 17:08:23 +01:00
Tony Corbett
5735209394 Better usage of display with DVMega 2016-05-05 16:13:06 +01:00
Tony Corbett G0WFV
9e6c7cff42 Beginnings of DVMega Display
Use the HD44780 real estate where TS1 is irrelevant.
2016-05-05 14:29:46 +01:00
Jonathan Naylor
91aba16d98 Add daemonisation under Linux and other enhancements (from Simon G7RZU) 2016-05-03 23:01:49 +01:00
Jonathan Naylor
99b71a00b2 Clean up the recent HD44780 changes. 2016-05-03 17:59:21 +01:00
Tony Corbett
414a1df408 HD44780 PWM backlight control 2016-05-01 16:59:43 +01:00
phl0
c2d4800f3b
Formatting issues 2016-04-27 22:30:24 +02:00
phl0
94aa27cc4b
Add config option for Nextion display sizes 2016-04-27 20:57:47 +02:00
Jonathan Naylor
db75e2ed09 Convert the D-Star module to upper case. 2016-04-19 17:27:00 +01:00
Jonathan Naylor
ae2ae9d188 Convert the callsign to upper case. 2016-04-19 17:25:13 +01:00
Jonathan Naylor
8eb564ba37 Translate DMR Id to callsign from a file. 2016-04-12 18:26:13 +01:00
Jonathan Naylor
a731703ac9 Add initial support for the Nextion display. 2016-04-06 19:53:25 +01:00
Jonathan Naylor
371684ae03 Add black list functionality for D-Star and DMR. 2016-04-06 18:46:05 +01:00
Jonathan Naylor
3ee457830b Allow for the configuration of the HD44780 pins. 2016-04-06 17:43:20 +01:00
Jonathan Naylor
a2130421a9 Add DMR prefix checking. 2016-04-04 19:03:38 +01:00
Jonathan Naylor
ea51eee15c Allow for locking the MMDVM to the callsign or id of the
repeater/hostspot.
2016-04-04 17:40:05 +01:00
Jonathan Naylor
9d03c83609 Allow for setting of outgoing port number on DMR networking. 2016-04-03 19:11:45 +01:00
Jonathan Naylor
a3c25766c0 Handle any frequency offset in the oscillator. 2016-03-21 21:50:45 +00:00
Jonathan Naylor
efa9ec1977 Add DMR slot delay parameter. 2016-03-17 18:12:14 +00:00
Jonathan Naylor
070bf2bff4 Add the HD4470 type display to Raspberry Pis. 2016-03-14 22:58:09 +00:00
Jonathan Naylor
8559f97efb Modify the logging system greatly. 2016-03-07 18:42:05 +00:00
Jonathan Naylor
e2c7a28fb9 Add the optional System Fusion Parrot. 2016-02-22 21:13:48 +00:00
Jonathan Naylor
360ca91de0 Upgrade the TFT Serial display driver and displayed information. 2016-02-16 18:30:12 +00:00
Jonathan Naylor
945d79a3ca Allow for the disabling of individual slots from the network. 2016-02-15 20:36:05 +00:00