Commit graph

2504 commits

Author SHA1 Message Date
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
Jonathan Naylor
d49c679b46 Merge branch 'master' into pocsag 2018-07-04 19:01:24 +01:00
Jonathan Naylor
bb9db2ce93 Clean up the merged code. 2018-07-04 19:00:51 +01:00
Jonathan Naylor
b65aa233b0
Merge pull request #435 from shawnchain/master
MMDVMHost patches from BG5HHP
2018-07-04 18:47:23 +01:00
Shawn Chain
1ef21b5b4f fix CStopWatch::start() return value to keep the compability 2018-07-04 21:28:17 +08:00
Shawn Chain
69f811012c Merge remote-tracking branch 'upstream/master' 2018-07-04 19:58:25 +08:00
Shawn Chain
2bd988d2a7 Missing time.h header for linux 2018-07-04 19:46:51 +08:00
Shawn Chain
657ef07b56 Fix time measurement issud 2018-07-04 17:54:38 +08:00
Andy CA6JAU
7bf82085c2 Fix DMR jitter default var value 2018-07-03 13:28:54 -04:00
Jonathan Naylor
834af61b7d Release m_tsdu in the P25 NID processing. 2018-07-03 08:14:37 +01:00
Shawn Chain
ae532156c5 fix memory leak in P25NID 2018-07-03 15:09:11 +08:00
Shawn Chain
1b7abded67 FIX DMRNewtork infinite failure on domain name resolve 2018-07-03 11:35:55 +08:00
Shawn Chain
1ab0610543 patch stdlib header 2018-07-03 10:04:44 +08:00
Shawn Chain
0ee26a5a98 patch to keep root permision for openwrt 2018-07-03 10:01:19 +08:00
Jonathan Naylor
93917ef9b4 Add a timer to refresh the DAPNET Gateways status every 30 seconds. 2018-06-28 07:08:04 +01:00
Jonathan Naylor
ca15dca23d Check the size of the getStatus return message. 2018-06-26 18:28:50 +01:00
Jonathan Naylor
7ed8c9a214 Fix Nextion screen for long POCSAG messages. 2018-06-20 19:58:35 +01:00
Jonathan Naylor
2606f66260 Fix reported POCSAG message bugs. 2018-06-20 18:20:37 +01:00
Jonathan Naylor
14bb1339ac Fixed the crash in a clean way. 2018-06-18 22:10:56 +01:00
Jonathan Naylor
282bffb3c4 Fix underflow bug when transmitting POCSAG data. 2018-06-18 21:49:38 +01:00
Jonathan Naylor
5cf86578fc Merge branch 'master' into pocsag 2018-06-18 18:18:36 +01:00
Jonathan Naylor
34ceb912c9 Move log initialisation. 2018-06-18 18:18:09 +01:00