Commit graph

55 commits

Author SHA1 Message Date
Jonathan Naylor
f1de23e568 Merge branch 'master' into M17_AX25_FM 2021-03-12 19:56:57 +00:00
SASANO Takayoshi
51e74c6182 revise UserDB display setting on OLED
To display UserDB on OLED, either Slot1=0/Slot2=1 or Slot1=1/Slot2=0
of [DMR Network] in MMDVM.ini was required.

Other displays such as LCDproc, HD44180 and TFTSurenoo uses duplex value of
[General], OLED also uses same entry from now.
2021-03-10 21:09:58 +09:00
Jonathan Naylor
e291096d22 Final modem refactoring. 2021-02-17 21:36:47 +00:00
Jonathan Naylor
ff9712b36a Refactored some class names. 2021-02-16 20:05:03 +00:00
Jonathan Naylor
d77e2a00ce Restore the branch 2020-12-15 16:21:07 +00:00
Jonathan Naylor
135fd04e0d Revert "Merge branch 'M17_AX25_FM'"
This reverts commit e1427e3e37, reversing
changes made to bcdba292eb.
2020-12-15 15:52:27 +00:00
Jonathan Naylor
eece693f05 Remove support for the Hobbytronics TFT display. 2020-11-10 10:08:59 +00:00
Jonathan Naylor
f89145b772 Remove support for the UMP (sob). 2020-11-10 09:58:10 +00:00
Jonathan Naylor
a57397e274 Merge branch 'AX25_FM' into M17_AX25_FM 2020-11-06 15:43:12 +00:00
Jonathan Naylor
e0f4928db5 Handle M17 in the display code. 2020-10-15 14:32:56 +01:00
Jonathan Naylor
2502ee94d7 Merge branch 'SimpleDMR' into AX25_FM 2020-09-03 12:10:01 +01:00
Jonathan Naylor
2349520964 Remove the location information from the new config message. 2020-08-27 10:13:02 +01:00
Jonathan Naylor
98879b5c14 Reinstated the location field. 2020-08-26 12:13:34 +01:00
Jonathan Naylor
66a17f4849 Simplify the Host to DMR Gateway protocol. 2020-08-26 09:29:11 +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
aa8b78a311 Refactor the Modem class hierarchy. 2020-06-30 12:35:03 +01:00
SASANO Takayoshi
36a852b38b change ScreenLayout definition for Nextion
to add new feature easily, the definition of ScreenLayout in [Nextion]
has changed like this.

ScreenLayout < 8: compatibile setting for old config file

	0: G4KLX @ 9600bps
	1: (reserved)
	2: ON7LDS @ 9600bps
	3: ON7LDS-DIY @ 9600bps
	4: ON7LDS-DIY @ 115200bps

ScreenLayout >= 8: new world, set the bit to enable each feature

	bit3 (8)	use 115200bps
	bit4 (16)	Display DMR Talker Alias
	bit5 (32)	Colour change when displaying TA
	bit6 (64)	Font size change when displaying long TA text
	bit7 (128)	Display DIY status when MMDVM IDLE

old settings are same as:

	0 -> 0
	2 -> 112 (16+32+64)
	3 -> 144 (16+128)
	4 -> 152 (8+16+128)
2020-06-14 16:00:20 +09:00
Jonathan Naylor
303a0163d3 Make the modem speed dynamic with a default of 115200. 2020-05-23 13:03:55 +01:00
Jonathan Naylor
dcdfca39d7 Add FM mode display. 2020-04-11 20:42:05 +01:00
SASANO Takayoshi
36414acc6a add UserDB-based NXDN display interface 2020-03-10 05:46:24 +09:00
SASANO Takayoshi
6febd661f6 add return value description of writeDMRIntEx() 2020-03-09 20:48:14 +09:00
SASANO Takayoshi
4ff77c50d6 use UserDBentry from findWithName() to writeDMR(), add writeDMREx() 2020-03-08 08:06:27 +09: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
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
sp5lg
bd5117b9e4 Introducing LogoScreensaver=1 or 0 parameter for blanking OLED diplays in idle 2019-09-27 22:28:57 +02:00
Shawn Chain
814059ff35 remove unused variables from OLED class 2019-05-14 18:19:02 +08:00
GuusvanDooren
6d83bfb8bc QSO info removed from OLED. QSO info add via CASTInfo. 2019-05-10 20:44:01 +02:00
Shawn Chain
50c2500f82 Extract the DMR talker alias decode logic from Display.cpp 2018-12-08 22:09:59 +08:00
Jonathan Naylor
4bf15438d5 Integrate the new messages into the OLED display driver. 2018-10-31 16:54:57 +00:00
Michael Eckhoff
f3c8f73ad9 Add Support for OLED Rotate 2018-10-30 09:30:41 -05: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
64e3ae6d30 Better way to send to display that MMDVMHost is quitting 2018-08-15 18:17:42 +02:00
Andy Taylor
7d77ac537f
Fix compile error:
Compile time error:

# make -f Makefile.Pi.PCF8574
g++ -g -O3 -Wall -std=c++0x -pthread -DHD44780 -DPCF8574_DISPLAY -I/usr/local/include -c -o Display.o Display.cpp
Display.cpp: In static member function ‘static CDisplay* CDisplay::createDisplay(const CConf&, CUMP*, CModem*)’:
Display.cpp:581:4: error: ‘m_display’ was not declared in this scope
    m_display = new CHD44780(rows, columns, conf.getCallsign(), dmrid, pins, i2cAddress, pwm, pwmPin, pwmBright, pwmDim, displayClock, utc, conf.getDuplex());
    ^
Makefile.Pi.PCF8574:24: recipe for target 'Display.o' failed
make: *** [Display.o] Error 1

looks like every other instance of "m_display" was changed to "display" apart from line 581.
2018-08-02 22:50:15 +01:00
Jonathan Naylor
69f1a2154c Reformat the Display factory method slightly. 2018-07-31 07:54:27 +01:00
Shawn Chain
464d0fdc6f Move display creation from main class to static CDisplay::create() 2018-07-31 11:36:37 +08:00
Jonathan Naylor
b398bba1ea Add POCSAG processing and display code. 2018-06-11 21:30:49 +01:00
Jonathan Naylor
c3990c36ed Add NXDN to the display code. 2018-01-17 19:04:00 +00: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
Jonathan Naylor
90e4794a3d Revert "Devel" 2017-10-24 21:55:58 +01:00
root
3a9c011dfa Refinements of the Nextion displays
* better looking fonts
* DMR talker alias is shown (in green) if received
* font is automaticly  adapted when TA would be too long for display
* DMR ID, call or TA (depending on what was shown) goes to gray at voice end
* "MMDVM stopped" at rest screen when MMDVMHost application is ended
* active network interface and IP address on rest screen so you know how to contact it
2017-10-02 21:04:46 +02:00
Jonathan Naylor
4db9f08d80 Fix formatting. 2017-02-13 08:54:25 +00:00
Jonathan Naylor
f0387d25dd Add BER display to the Nextion and reduce Talker Id logging. 2017-02-12 18:37:00 +00:00
Jonathan Naylor
3c9666e780 Display the RSSI on the Nextion screen. 2017-01-05 19:44:52 +00:00
Jonathan Naylor
25cfff3ada Merge branch 'master' into P25 2016-09-27 19:47:07 +01:00
phl0
28775026d4
Add timer to return from CW Ident 2016-09-15 15:17:51 +02:00
phl0
7246fde0ec
Add functions to Display.cpp and .h 2016-09-15 11:50:35 +02:00
Jonathan Naylor
7171af365d The P25 destination is an integer. 2016-09-12 20:23:50 +01:00
Jonathan Naylor
e2ec5292b5 Update the display code for P25. 2016-09-12 18:12:32 +01:00
Jonathan Naylor
90772a2a9b Add optional clocking for the displays. 2016-05-21 12:28:09 +01:00