Commit graph

2518 commits

Author SHA1 Message Date
Jonathan Naylor
8d87037ee5
Merge pull request #558 from jg1uaa/master
TFTSurenoo: Simplify DMR status display
2020-02-29 12:15:32 +00:00
SASANO Takayoshi
0bc6bcdb26 Fix DMR status display for duplex mode
Previous change (simplyfy DMR status display) did not consider
DMR duplex mode.

Now DMR simplex mode uses 2-lines style, duplex mode 4-lines like this.

	Listening
	TS1
	N Callsign
	TS2 TGxx

For this change, statusLine() no longer have meaning.
It will be removed in the future.
2020-02-29 06:51:26 +09:00
SASANO Takayoshi
ead41ba9a5 Simplify DMR status display
Old DMR status display takes 4 lines i.e.:

	1 Listening
	(unused line here)
	2 N Callsign
	TGxx

To make room for display area for future development, DMR status display
are changed to 2-lines style like this:

	N Callsign
	TS2 TGxx

And, added three small changes:

	- use statusLine() macro to change layout easily
	- use two -> three colors
		yellow: radio mode (DMR, YSF, etc)
		cyan: main status (callsign, TG/Timeslot)
		dark green: additional information (D* reflector etc) *NEW*
	- rename statusLine_offset() -> statusLineOffset()
2020-02-28 04:53:14 +09:00
Jonathan Naylor
b0fe8dc607
Merge pull request #557 from jg1uaa/master
TFTSurenoo: stability fix (workaround for display is not cleared)
2020-02-25 22:44:56 +00:00
SASANO Takayoshi
a117d70c56 send CR+LF (command terminator) first at refreshDisplay()
Sometimes BOXF (box fill) command at refreshDisplay() fails.
Normally this is not occured, but running MMDVMHost for long time
(about one day) we see this problem.

The reason is unknown. But if LCD panel receives garbage character between
calling refreshDisplay(), first command (BOXF) at latter-called
refresDdisplay() will fail.

For workaround, send CR+LF command terminator first at this function.
2020-02-24 17:52:30 +09:00
Jonathan Naylor
2a9d90b7c7
Merge pull request #555 from jg1uaa/master
Lookup name on DMR network late entry (2)
2020-02-17 11:56:34 +00:00
SASANO Takayoshi
45013ac179 Lookup name on DMR network late entry (2)
There is two cases that shows "received network late entry"

1. dataType == DT_VOICE_PI_HEADER && m_netState != RS_NET_AUDIO
2. dataType == DT_VOICE_SYNC && m_netState == RS_NET_IDLE

case 1 is already treated. this fix is for case 2.
2020-02-17 19:57:47 +09:00
SASANO Takayoshi
b86bc820e8 Merge remote-tracking branch 'upstream/master' 2020-02-17 07:02:02 +09:00
Jonathan Naylor
4450caeddc Update the copyright date. 2020-02-16 15:56:31 +00:00
Jonathan Naylor
fa08abfded Lookup name on DMR network late entry. 2020-02-16 15:52:42 +00:00
Jonathan Naylor
8b172f1221
Merge pull request #551 from jg1uaa/master
improve refreshing display
2020-02-16 15:45:01 +00:00
SASANO Takayoshi
88304997d4 Merge remote-tracking branch 'upstream/master' 2020-02-15 07:55:36 +09:00
Jonathan Naylor
d70a124f47 Update files to VS2019. 2020-02-14 20:53:21 +00:00
SASANO Takayoshi
60e82737b9 improve refreshing display
Display space character with DCV command to clear screen, but this command is
very slow. I tested filling whole 160x128 area with 8x16 character by DCV16
command, it took 540msec.

This is the worst case, but display refresh period has extended to 600ms
for safety.

To clear screen, use BOXF command instead. And, reduced issuing DCV command.
2020-01-18 06:29:49 +09:00
Jonathan Naylor
95c1bbb8e6
Merge pull request #550 from f1rmb/OPENGD77_HS
Identify OpenGD77 hotspot.
2020-01-10 11:28:47 +00:00
Daniel Caujolle-Bert
5686942519
Identify OpenGD77 hotspot. 2020-01-08 10:58:41 +01:00
Jonathan Naylor
3fa72d853d Fix compilation warnings. 2019-12-27 17:26:46 +00:00
Jonathan Naylor
a0ec58539a Remove duplication of frames. 2019-12-15 22:22:47 +00:00
Jonathan Naylor
3b7452feda Update for VS2017 2019-12-15 22:20:03 +00:00
Jonathan Naylor
0e78fafa91
Merge pull request #543 from jg1uaa/master
Add Surenoo UART-TFT panel (1.8inch, 128x160) support.
2019-12-08 21:44:04 +00:00
SASANO Takayoshi
be6f59ba5f fix copyright header
Add coder's name.

This code is forked from TFTSerial.cpp and TFTSerial.h
so original author's credit is kept.
2019-12-09 06:38:21 +09:00
Jonathan Naylor
ce5a212bd3
Merge pull request #542 from shawnchain/fix_emb_fec
Fix DMREMB FEC decode bug
2019-12-07 16:18:42 +00:00
Shawn Chain
ab226cec27 change variable type to unsigned char 2019-12-07 23:25:57 +08:00
Shawn Chain
31408d4a33 Fix DMREMB fec decode bug 2019-12-07 15:47:43 +08:00
Jonathan Naylor
6713e0f52b
Merge pull request #540 from simonvik/patch-1
Add wiringpi as build dep when building the oled target.
2019-12-04 14:12:26 +00:00
Simon Vikström
1ba4879224
Update OLED.md
wiringpi is needed when building the OLED target.
2019-12-04 15:07:54 +01:00
SASANO Takayoshi
f3844ceae8 Add Surenoo UART-TFT panel (1.8inch, 128x160) support.
HobbyTronics TFT Shield has discontinued, here is a replacement TFT module
that can be controlled from UART.

Different from TFT Shield, it cannot display figures that stored in
micro SD card. So appearance is simplified like OLED.

Surenoo module sometimes ignores display commands (in busy stuation?),
this driver buffers display status and refresh at clockInt().
2019-12-01 16:33:19 +09:00
Jonathan Naylor
b29e1d0050
Merge pull request #536 from maierp/maier_p_dont_remove_ovcm
Don't remove OVCM bit. Only set it when configured.
2019-11-29 16:15:10 +00:00
Patrick Maier
9234dfcf6a Don't remove OVCM bit. Only set it when configured. 2019-11-23 11:11:53 +01:00
Jonathan Naylor
ed7f593e07 Remove the duplicate end of DMR transmission network message. 2019-11-20 08:13:26 +00:00
Jonathan Naylor
de88f09b68
Merge pull request #534 from shawnchain/fix_ovcm_config
Change ovcm config to int value
2019-11-19 07:53:18 +00:00
Shawn Chain
2ecd9b3440 fix OVCM enum logical check 2019-11-19 11:05:45 +08:00
Shawn Chain
c2584066d8 Correct the m_ovcm flag check in DMRSlot 2019-11-18 20:47:56 +08:00
Shawn Chain
88d91e420a use enum DMR_OVCM_TYPES 2019-11-17 10:57:58 +08:00
Shawn Chain
d5b08ea7ea fix config comment typo 2019-11-16 23:14:55 +08:00
Shawn Chain
2f9595949a Change ovcm config to int value 2019-11-16 23:06:26 +08:00
Jonathan Naylor
aa7ae2371c
Merge pull request #533 from maierp/maier_p_ovcm_rx
Config setting for sending OVCM to network (RX)
2019-11-15 11:58:02 +00:00
Jonathan Naylor
b38ba239a8 Merge branch 'master' into dmr_beacons 2019-11-13 08:41:11 +00:00
Patrick Maier
7cdbbdecb0 fix missing changes of ovcmRX in MMDVMHost.cpp 2019-11-09 20:50:03 +01:00
Patrick Maier
6caffb2bc0 Separate the config if OVCM should be supported in sending and receiving direction 2019-11-09 17:22:39 +01:00
Jonathan Naylor
8d88d8e5ed Update the NXDN IDs file from radioid.net. 2019-11-07 14:02:40 +00:00
Jonathan Naylor
484b0f3e25 Update the DMR Ids. 2019-11-07 13:53:57 +00:00
Jonathan Naylor
231efdf567 Clean up the OVCM CSBK code. 2019-11-07 13:47:19 +00:00
Jonathan Naylor
e74df4875b
Merge pull request #532 from maierp/maierp_ovcm_in_csbk
Include ovcm also in csbk
2019-11-06 15:28:34 +00:00
Florian (DF2ET)
fa8d735b1b
Merge pull request #531 from shawnchain/disable_ovcm_ini
Comment out the OVCM=1 in MMDVM.ini
2019-11-06 06:51:57 +01:00
Shawn Chain
c18c0a3105 Comment out the OVCM=1 in MMDVM.ini 2019-11-06 13:23:49 +08:00
Jonathan Naylor
bc5a1d24c4 Make the default for OVCM to be off. 2019-11-05 15:49:00 +00:00
Jonathan Naylor
f4f745d58c Fix variable scope bug. 2019-11-05 12:44:56 +00:00
phl0
4be7ccd924
Fix changed type for dmr_Beacons 2019-11-05 12:50:59 +01:00
Jonathan Naylor
ef1631ac33 Convert strncpy to memcpy to avoid static analysis complaints. 2019-11-05 09:01:49 +00:00