Merge: Resolving conflicts by accepting local changes for 1.8.0 features

main
swanie98635 2 months ago
commit 7a18ddf831

@ -7,6 +7,6 @@ location:
voice: voice:
tts_command: "pico2wave -w {file} \"{text}\"" tts_command: "pico2wave -w {file} \"{text}\""
audio: audio:
nodes: ['62394'] nodes: ['your node here']
alerts: alerts:
check_interval_minutes: 15 check_interval_minutes: 15

@ -4,7 +4,7 @@ import sys
import shutil import shutil
# Configuration # Configuration
TEST_NODE = "62394" # User confirmed this node TEST_NODE = "your node here" # User confirmed this node
TONE_FILE = "/tmp/test_tone.wav" TONE_FILE = "/tmp/test_tone.wav"
FINAL_TONE_FILE = "/var/lib/asterisk/sounds/test_tone.wav" FINAL_TONE_FILE = "/var/lib/asterisk/sounds/test_tone.wav"
TTS_FILE = "/tmp/test_tts.wav" TTS_FILE = "/tmp/test_tts.wav"

@ -1,22 +1 @@
W0 Colorado, Iowa, Kansas, Minnesota
Missouri,Nebraska,North-Dakota,South-Dakota
W1 Connecticut, Maine, Massachusetts
New-Hampshire,Rhode-Island,Vermont
W2 New-Jersey, New-York
W3 Delaware, D.C., Maryland, Pennsylvania
W4 Alabama, Florida,Georgia,Kentucky
North-Carolina, South-Carolina, Tennessee,Virginia
W5 Arkansas , Louisiana , Mississippi
New-Mexico , Oklahoma , Texas
W6 California
W7 Arizona , Idaho , Montana , Nevada
Oregon , Utah, Washington , Wyoming
W8 Michigan , Ohio , West-Virginia
W9 Illinois , Indiana , WisconsinWH0 Mariana-Is
WH2 Guam
WH6 Hawaii
WH8 American Samoa
WL7 Alaska
WP2 Virgin Islands
WP4 Puerto Rico

Loading…
Cancel
Save

Powered by TurnKey Linux.