Commit graph

1995 commits

Author SHA1 Message Date
phl0
7b121ac6fd
Merge remote-tracking branch 'upstream/master' into LOCKOUT_UMP 2016-11-09 18:40:16 +01:00
Jonathan Naylor
615b382e50 Merge pull request #206 from vk4tux/patch-20
Update DMRIds.dat
2016-11-09 17:25:16 +00:00
phl0
90a10560d7
Correct variable assignment 2016-11-09 09:32:30 +01:00
vk4tux
b5bba5833e Update DMRIds.dat 2016-11-09 18:28:05 +10:00
phl0
d7fe8f1d47
Add option to disable LOCKOUT on UMP 2016-11-09 09:25:55 +01:00
Jonathan Naylor
b59dceb911 Merge pull request #205 from phl0/dev
Add proper exit code and success message
2016-11-08 20:49:00 +00:00
phl0
6f3b581123
Add proper exit code and success message 2016-11-08 21:45:52 +01:00
phl0
2b80ca7732
Change MCU version to MCU code 2016-11-08 16:26:26 +01:00
phl0
63aa842c70
Remove needless brackets 2016-11-08 16:22:47 +01:00
phl0
6ff224f13e
Move version info to MCU version 2016-11-08 16:14:12 +01:00
phl0
61b87bea20
Add info about firmware version 2016-11-08 16:11:57 +01:00
phl0
81708858f8
Add info about touchscreen support 2016-11-08 16:10:12 +01:00
Jonathan Naylor
3aac82a23d Merge pull request #202 from phl0/fixnextion
Make nextion.py compatible with pyserial < v3
2016-11-07 10:45:49 +00:00
phl0
b8f8fa89c0
Make nextion.py compatible with pyserial < v3 2016-11-07 10:51:53 +01:00
Jonathan Naylor
29a8f7fd94 Merge pull request #201 from phl0/nextion.py
Add proper error handling to nextion.py
2016-11-06 21:58:31 +00:00
phl0
3f6a34a8b5
Add check for correct model number of display 2016-11-06 22:55:15 +01:00
phl0
b85d702224
Add error handling to opening of serial device 2016-11-06 22:51:48 +01:00
Jonathan Naylor
4f94ed375c Merge pull request #200 from AlexEKoren/master
added device name and model type options for CLI
2016-11-05 22:14:18 +00:00
Alex Koren
63b03f7c73 added device name and model type options for CLI 2016-11-05 15:12:11 -07:00
Jonathan Naylor
1994f0049a Add more UMP logging. 2016-11-05 18:41:41 +00:00
Jonathan Naylor
ef4b03626b Merge branch 'master' of github.com:g4klx/MMDVMHost 2016-11-05 18:36:00 +00:00
Jonathan Naylor
612bb5e65a Merge pull request #199 from phl0/updateTFTs
Update tft files with latest Nextion firmware
2016-11-05 13:04:08 +00:00
phl0
6c3d07a4e8
Update tft files with latest Nextion firmware 2016-11-05 13:49:13 +01:00
Jonathan Naylor
9ba0e11712 Merge pull request #196 from AlexEKoren/master
Added working Nextion Uploader
2016-11-05 08:58:32 +01:00
Alex Koren
09947d5a2c changed device to standard (was compatible with OSX) 2016-11-04 11:45:53 -07:00
Alex Koren
398b9964a1 added license to nextion.py 2016-11-04 11:44:38 -07:00
Alex Koren
8158df8424 added 2.4" Nextion uploader 2016-11-04 11:40:42 -07:00
Jonathan Naylor
d5c382840f Make the LED flash a little faster. 2016-11-04 10:24:41 +00:00
Jonathan Naylor
4581a7c9fd Stop double opens and closes on the UMP when used for Nextion and control lines. 2016-11-04 09:55:55 +00:00
Jonathan Naylor
fcfe171365 Record that the UMP is already open. 2016-11-04 09:53:41 +00:00
Jonathan Naylor
8d91fc7933 Merge pull request #195 from phl0/fixOLED
Fix OLED header file (ref. b69336d)
2016-11-04 09:31:52 +01:00
Jonathan Naylor
410098959d Handle unknown CSBKs better. 2016-11-04 08:25:48 +00:00
phl0
757a0bfeb2
Fix OLED header file (ref. b69336d) 2016-11-04 08:56:39 +01:00
Jonathan Naylor
91756e37be Add optional UMP serial debugging. 2016-11-04 07:07:53 +00:00
Jonathan Naylor
9238d74082 Improve the serial port parsing. 2016-11-04 06:46:27 +00:00
Jonathan Naylor
496078928c Fix Linux compiler error. 2016-11-03 22:11:52 +00:00
Jonathan Naylor
b69336dca1 Clean up the OLED configuration. 2016-11-03 21:43:29 +00:00
Jonathan Naylor
8f2a2a1d46 The initial version of the UMP sketch. 2016-11-03 20:29:56 +00:00
Jonathan Naylor
34538d8b3f Add the optional DMR network options command. 2016-11-03 19:27:52 +00:00
Jonathan Naylor
2a5162d194 Remove the Nextion tft upload script. 2016-11-03 19:08:36 +00:00
Jonathan Naylor
015896a299 Add the host support for the UMP. 2016-11-03 19:07:44 +00:00
Jonathan Naylor
2ac7e43929 Alter and clean up the P25 network protocol. 2016-11-01 19:01:37 +00:00
Jonathan Naylor
18acbfe8f1 Allow network late entry on a PI header. 2016-11-01 18:07:10 +00:00
Jonathan Naylor
5ae3b6a9d2 Clean up the access control code for DMR. 2016-11-01 08:00:13 +00:00
Jonathan Naylor
6fdfb93514 Simplify the P25 protocol. 2016-11-01 07:42:34 +00:00
Jonathan Naylor
7431f5009a Make DMR networking more robust. 2016-10-31 18:11:32 +00:00
Jonathan Naylor
4f6356212b Handle corrupted network DMR LCs more gracefully. 2016-10-31 17:55:38 +00:00
Jonathan Naylor
202764dedd Fix VS2015 compile for LCDProc. 2016-10-31 17:52:27 +00:00
Jonathan Naylor
8303a940b1 Merge pull request #190 from phl0/corrLCDproc
Correct compiling with LCDproc and Adafruit/HD44780 displays
2016-10-31 13:36:50 +01:00
phl0
618b35ab58
Change capitalization of variable names to align with the rest of the
code
2016-10-31 12:59:08 +01:00