Commit graph

1925 commits

Author SHA1 Message Date
Jonathan Naylor
f149cc48f9
Merge pull request #460 from lucamarche-iz1mlt/master
Add select ack message dstar
2018-09-14 13:04:49 +01: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
Florian (DF2ET)
f6cd479117
Merge pull request #459 from on7lds/devel
Process data from display to MMDVMHost
2018-09-13 21:15:38 +02:00
root
574343c439 Process data from display to MMDVMHost (serial pass-through & transparent data)
also taking into account the sendFrameType parameter
Do not control Nextion backlight when active brightness is zero
2018-09-13 20:35:12 +02:00
Jonathan Naylor
ea086676a7 Bump the version date. 2018-09-10 08:57:49 +01:00
Jonathan Naylor
131d87c830 Clean up the code to remove warnings. 2018-09-06 17:10:58 +01:00
Jonathan Naylor
8ee9f2f7af
Merge pull request #457 from KD4Z/TX_RX_freq_to_display
Nextion Display - Add more dynamic variables and fix command mangling
2018-09-05 21:26:14 +01: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
KD4Z
000ef35c13 Merge remote-tracking branch 'refs/remotes/g4klx/master' 2018-08-22 10:17:13 -04:00
Florian (DF2ET)
68f00962e3
Merge pull request #456 from PD0DIB/patch-1
Update README.md
2018-08-20 11:46:05 +02:00
Rob van Rheenen
7d97fdf54a
Update README.md 2018-08-20 11:34:19 +02:00
Andy CA6JAU
b66a92bb9c Fix other crashes 2018-08-20 00:47:45 -03:00
Andy CA6JAU
713d12e5a4 Fix modem re-connect crash 2018-08-20 00:12:38 -03:00
Jonathan Naylor
f0ea25d954
Merge pull request #455 from on7lds/devel
Fix buffer overflow + better way to display that MMDVMHost quits
2018-08-15 22:17:41 +01:00
root
64e3ae6d30 Better way to send to display that MMDVMHost is quitting 2018-08-15 18:17:42 +02:00
root
df2b27f585 Fix buffer overflow when writing ipaddress info that became too long to Nextion display
(i.e. when using Predictable Network Interface Names in linux)
2018-08-15 15:59:53 +00:00
Jonathan Naylor
e8348d972e
Merge pull request #453 from on7lds/devel
Better YSF image +  New option SendFrameType (Transparent data section)
2018-08-14 17:52:51 +01:00
root
30263ca98c Added SendFrameType with default value option to MMDVM.ini 2018-08-14 18:29:07 +02: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
root
f58ef17eb7 Better YSF image 2018-08-12 11:27:03 +02:00
Jonathan Naylor
71a6f9334a
Merge pull request #450 from AndyTaylorTweet/patch-1
Fix compile error:
2018-08-02 22:52:01 +01: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
Jonathan Naylor
b194598f2a
Merge pull request #447 from shawnchain/refactor-display
Move display creation from main class to static CDisplay::create()
2018-07-31 07:45:25 +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
9cb7790bf9 Clean up the code for Windows and style. 2018-07-30 18:19:46 +01:00
Jonathan Naylor
dc91751e5b
Merge pull request #446 from shawnchain/refactor-serialcontroller
Extract I2C logic from SerialController to separate class
2018-07-30 17:49:12 +01:00
Shawn Chain
d715470b1c Extract I2C logic from SerialController to separate class 2018-07-30 21:58:35 +08:00
Jonathan Naylor
77aa470649
Merge pull request #444 from on7lds/devel
ON7LDS Nextion displays update (POCSAG)
2018-07-30 10:38:30 +01:00
root
b69db45cb0 Added POCSAG to ON7LDS layouts, Readme files update
Higher resolution POCSAG image for >320px
2018-07-28 10:57:35 +02:00
Jonathan Naylor
f4718ebb9c Fix Windows compile error. 2018-07-26 18:43:57 +01:00
Andy CA6JAU
e97006d7c9 Fix stderr messages in daemon mode 2018-07-24 00:29:05 -04:00
Jonathan Naylor
c9505b827d Bump the version date. 2018-07-23 21:52:34 +01:00
Andy CA6JAU
3694da2dcd Drop duplicate and out-of-sequence DMR audio frames from RF 2018-07-21 21:01:55 -04:00
Andy CA6JAU
e5c2ede05c Fix macOS compilation 2018-07-21 20:41:55 -04:00
Florian (DF2ET)
9c17f83f9e
Merge pull request #443 from dd5xl/master
Add forwarding of alphanum payload for func Alert2 msgs
2018-07-20 11:47:22 +02:00
maschinist
92ae98b36e Add forwarding of alphanum payload for func Alert2 msgs 2018-07-20 11:18:46 +02:00
Jonathan Naylor
03682b000a Clean up the I2C code. 2018-07-19 18:42:23 +01:00
Jonathan Naylor
d16a06db07
Merge pull request #442 from Hootie81/VK6MST_Shield
Add support for VK6MST_Shield
2018-07-19 18:25:00 +01: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
0cf59963dd Simplify the new stopwatch code. 2018-07-15 20:33:14 +01:00
Jonathan Naylor
f85c9b0790 Add support for POCSAG Alert 1 and Alert 2. 2018-07-15 19:31:42 +01:00
Florian (DF2ET)
6b4ecb193a
Merge pull request #440 from BG4TGO/master
OLED Display
2018-07-13 17:04:51 +02:00
Tom
f22e44b4f4
Update OLED.cpp 2018-07-13 22:04:21 +08:00
Tom
93dd673faf
Update OLED.cpp 2018-07-13 12:58:28 +08:00
Jonathan Naylor
177a69f547 Allow for older firmwares to report their statuses. 2018-07-06 06:48:50 +01:00
Jonathan Naylor
3d1423f819 Bump the version date. 2018-07-05 18:43:10 +01:00
Jonathan Naylor
5d9c7a39bd Merge branch 'master' into pocsag 2018-07-04 21:50:11 +01:00
Jonathan Naylor
d1b5e73406 Fix Linux compiler warning. 2018-07-04 21:41:31 +01:00
Jonathan Naylor
7bb1409498 Restore the correct copyright message. 2018-07-04 21:36:21 +01:00