Merge remote-tracking branch 'travis/master'

db/Makefile

@@ -2,22 +2,21 @@ include ../curl.mak
 
 .PHONY: all update clean
 
-#all: stripped.csv repeaters.csv users.json repeaters.json
-all: stripped.csv 
+all: stripped.csv
 
 clean:
-	rm -f repeaters.csv users.json repeaters.json special_IDs.csv *.tmp stripped.csv
+	rm -f special_IDs.csv *.tmp stripped.csv
 
 update:
 	"${MAKE}" clean
 	"${MAKE}" stripped.csv
-	
+
 update_eur:
 	"${MAKE}" clean
 	"${MAKE}" stripped.csv
 	<stripped.csv awk -F, -f privacy_filter.awk >stripped2.csv
 	mv stripped2.csv stripped.csv
-	
+
 #This strips out all unicode characters.
 #We'd rather just drop the accents.
 ICONV=iconv -c -f UTF-8 -t ascii//TRANSLIT
@@ -26,33 +25,18 @@ custom.csv:
 	touch custom.csv
 
 stripped.csv: custom.csv special.tmp fixed.csv dmrmarc2.tmp reflector.tmp
-	awk -F, -f combine.awk $^ | $(ICONV)  | sort -t ',' -k1g,1 | awk -F, -f strip.awk >stripped.csv	
-	
+	awk -F, -f combine.awk $^ | $(ICONV)  | sort -t ',' -k1g,1 | awk -F, -f strip.awk >stripped.csv
+
 dmrmarc2.tmp: dmrmarc.tmp
 	awk -F, -f insert_nick.awk <$< >$@
-	
+
 dmrmarc.tmp:
-	wget --timeout=120 --no-check-certificate --wait=3 'https://www.radioid.net/static/users.csv' -O $@
+	wget --timeout=120 --no-check-certificate --wait=3 'https://ham-digital.org/status/users.csv' -O $@
 
 reflector.tmp:
 	curl $(CURL_FLAGS) 'http://registry.dstar.su/reflector.db' | perl -pe '$$_ = "" if ( $$. == 1 ); s#@#,#; s#@.*#,,,,,,#' >$@
-		
+
 special.tmp:
 	python2 get_special_IDs.py
-
-users.json:
-	curl $(CURL_FLAGS) 'https://www.radioid.net/static/users.json' >$@
-
-repeaters.json:
-	curl $(CURL_FLAGS) 'http://www.dmr-marc.net/cgi-bin/trbo-database/datadump.cgi?table=repeaters&format=json&header=0' >$@
-
-repeaters.csv:
-	curl $(CURL_FLAGS) 'http://www.dmr-marc.net/cgi-bin/trbo-database/datadump.cgi?table=repeaters&format=csv&header=0' | perl -pe 's,<BR/>,,' >$@
-
-# not used
-bmgroups.json:
-	curl $(CURL_FLAGS) 'https://brandmeister.network/dist/js/bm/groups.js' >$@
-
 
 ci: clean all
-

md380_tool.py

@@ -871,7 +871,7 @@ def main():
                     spiflashwrite(dfu, sys.argv[2], adr)
                 else:
                     print("address too low")
-            if sys.argv[1] == 'dump':
+            elif sys.argv[1] == 'dump':
                 print("Dumping memory from %s." % sys.argv[3])
                 dfu = init_dfu()
                 dump(dfu, sys.argv[2], sys.argv[3])

md380org/content/features/amenu.md

@@ -0,0 +1,32 @@
++++
+date = "2018-06-20T22:56:00-04:00"
+draft = false
+title = "Application Menu"
+
+[menu.main]
+parent = "Features"
+identifier = "amenu"
+
++++
+
+The Application Menu (abbreviated amenu) is a menu the md380tools developers added, completely separate from the original stock firmware's menu system. 
+
+How to open
+-----------
+With md380tools firmware, It can currently be opened with the red "back" button.  
+In KG5RKI's fork of md380tools, it can be opened with the "#" key.  
+You navigate through the menu with the arrow keys, the green button enters submenus, edits fields, and saves values, and the red button serves as a "back" button.
+
+It looks something like this:
+![amenu\_example](amenu.bmp)
+
+You can close it again by pressing again whatever button you pressed to open it.
+
+Application Menu features
+-------------------------
+* Channel Display
+* Quick zone change
+* Contact display
+* [Quick talkgroup change](quicktgchange)
+* [Test/Setup options](testsetup)
+* Netmon menu (Here you'll find all the net monitor displays, including Last Heard (Netmon 4, so press the "4" key).

md380org/content/features/amenu/quicktgchange.md

@@ -0,0 +1,26 @@
++++
+date = "2018-06-20T22:56:00-04:00"
+draft = false
+title = "Quick TG Change"
+
+[menu.main]
+parent = "amenu"
+identifier = "quicktgchange"
+
++++
+
+The [Application Menu](..) includes a way to quickly change the target talkgroup "ad-hoc". It is a temporary change - it will return to the value programmed into the selected channel once you change channels. 
+
+I'm going to enter my ID (not a valid "talkgroup" since it's a user id, but it serves as an example), 3125404. You will use something more like 3 for North America, or 3172 for "Northeast".
+Select the "TkGrp" entry with the arrow keys, 
+![amenu quickly change talkgroup](amenu_change_tg.bmp)
+then press the green button to edit the field.
+![amenu quickly change talkgroup](amenu_change_tg_2.bmp)
+If you need to enter a shorter ID like here, you can press the red button to delete any digits leftover from the previous talkgroup (necessary if you change from 3100 to 3, for instance).
+![amenu quickly change talkgroup](amenu_change_tg_3.bmp)
+Then press the green button to confirm the change.
+![amenu quickly change talkgroup](amenu_change_tg_4.bmp)
+Note the "Cont"act field has a "*" to indicate it's an ad-hoc contact, and temporary.
+
+
+One of the main benefits to this capability is that codeplugs can be very simple - only having different channels for the most popular or most used talkgroups. All other talkgroups can be set ad-hoc, saving effort and radio memory.

md380org/content/features/amenu/testsetup.md

@@ -0,0 +1,59 @@
++++
+date = "2018-06-20T22:56:00-04:00"
+draft = false
+title = "Test/Setup"
+
+[menu.main]
+parent = "amenu"
+identifier = "testsetup"
+
++++
+
+The Application Menu also has some testing and setup submenus, found here.
+![amenu test/setup](amenu_test_setup.bmp)
+
+![amenu test/setup inside](amenu_test_setup_inside.bmp)
+
+
+Backlight
+---------
+Your first options are for the backlight - here, I have a bug, where "Level Hi" should be equal to 9, the brightest backlight setting. This is likely my fault, so I'll just go fix that number. I'd also like to set "Lo" (where the screen would be "off" in the stock firmware) to "1", which is very dim but still readable in low light. "0" is, of course, off - no backlight. You change these values like any other field on the MD380 - select with the arrow keys, green button to edit the field, arrow keys to modify the value, and green to save the value.
+![amenu setup backlight levels](amenu_setup_backlight_levels.bmp)
+
+The Time/sec field is how many seconds of inactivity before the backlight is set to "Lo".
+
+
+Morse Output
+------------
+Morse output is off by default but can be "enabled" or even "verbose". Morse output will play the various menu entries using morse code, allowing blind operation of the radio.
+Menu entries are read with the label in a lower pitch, and the value in a higher pitch.
+![morse off](morse_off.bmp)
+Morse off naturally means nothing is "read" aloud to you in morse code.
+![morse enabled](morse_enabled.bmp)
+Enabled will read menu options and channel numbers.
+![morse verbose](morse_verbose.bmp)
+Enabled will read menu options and channel names.
+![morse volume 100](morse_volume_100.bmp)
+You can also change the speed, pitch, and volume of the morse narrator to your liking.
+
+Colours
+-------
+Change your color scheme, or use existing presets.
+![amenu setup colors](amenu_setup_colors.bmp)
+Choose a color scheme by selecting with arrow keys, and saving with the green entry.
+![amenu setup colorscheme menu](amenu_setup_colors_menu.bmp)
+There are a few options, including green on dark green:
+![amenu setup green colors](amenu_setup_green_color.bmp)
+You can edit colors manually. 
+![amenu setup colorscheme menu manual color](amenu_setup_green_color_manual.bmp)
+This is the color editor screen. 
+The green radio button will save the current color.
+The 1, 2, and 3 buttons will choose which color channel (red, green, blue) you are editing.
+The arrow keys can adjust that channel up or down.
+![amenu setup colorscheme menu color editor](color_editor.bmp)
+
+
+Test/Debug
+----------
+Data and options for test and debugging purposes.
+![amenu setup colorscheme menu](amenu_setup_green_color_test_debug.bmp)

md380org/content/features/morse.md

@@ -18,3 +18,14 @@ and other on-screen items audibly in Morse code so you can know which
 Zone or Channel is selected without looking at the screen.
 
 
+Morse output is off by default but can be "enabled" or even "verbose" using the [Application Menu on the red button](/features/amenu).
+Morse output will play the various menu entries using morse code, allowing blind operation of the radio.
+Menu entries are read with the label in a lower pitch, and the value in a higher pitch.
+![morse off](/features/amenu/testsetup/morse_off.bmp)
+Morse off naturally means nothing is "read" aloud to you in morse code.
+![morse enabled](/features/amenu/testsetup/morse_enabled.bmp)
+Enabled will read menu options and channel numbers.
+![morse verbose](/features/amenu/testsetup/morse_verbose.bmp)
+Enabled will read menu options and channel names.
+![morse volume 100](/features/amenu/testsetup/morse_volume_100.bmp)
+You can also change the speed, pitch, and volume of the morse narrator to your liking.

md380org/content/features/promiscuous.md

@@ -20,4 +20,7 @@ traffic comes in on your selected timeslot.  You can then quickly jot
 down the settings to update your codeplug.
 
 
-
+Enable the feature in the menus under:
+Menu -> Utilities -> MD380Tools -> DMR Setup -> Promiscuous
+![promiscuous menu entry](promiscuous_menu_entry.bmp)
+![promiscuous menu entry](promiscuous_enable.bmp)