From 1b95cae8e1bd85c1eb8809432acdac7d49123f26 Mon Sep 17 00:00:00 2001 From: "Esteban Mackay Q." Date: Sat, 15 Feb 2025 14:47:31 -0500 Subject: [PATCH] fix parrot fix parrot reaction , change peer to master --- config/ADN-MINIMAL.cfg | 41 ++++++++++++++------------------- config/ADN-SAMPLE-commented.cfg | 40 ++++++++++++++------------------ config/ADN-SAMPLE.cfg | 40 ++++++++++++++------------------ config/parrot.cfg | 35 ++++++++++++++++++++++------ 4 files changed, 79 insertions(+), 77 deletions(-) diff --git a/config/ADN-MINIMAL.cfg b/config/ADN-MINIMAL.cfg index 53bd377..15ab945 100755 --- a/config/ADN-MINIMAL.cfg +++ b/config/ADN-MINIMAL.cfg @@ -66,39 +66,32 @@ ALLOW_UNREG_ID: False PROXY_CONTROL: False OVERRIDE_IDENT_TG: - [ECHO] -MODE: PEER +MODE: MASTER ENABLED: True -LOOSE: False +REPEAT: True +MAX_PEERS: 1 EXPORT_AMBE: False IP: 127.0.0.1 PORT: 54917 -MASTER_IP: 127.0.0.1 -MASTER_PORT: 54915 -PASSPHRASE: passw0rd -CALLSIGN: ECHO -RADIO_ID: 9990 -RX_FREQ: 449000000 -TX_FREQ: 444000000 -TX_POWER: 25 -COLORCODE: 1 -SLOTS: 1 -LATITUDE: 00.0000 -LONGITUDE: 000.0000 -HEIGHT: 0 -LOCATION: 9990 Parrot -DESCRIPTION: ECHO -URL: adn.systems -SOFTWARE_ID: 20170620 -PACKAGE_ID: MMDVM_ADN-Systems +PASSPHRASE: GROUP_HANGTIME: 5 -OPTIONS: USE_ACL: True +REG_ACL: DENY:1 SUB_ACL: DENY:1 -TGID_TS1_ACL: PERMIT:ALL -TGID_TS2_ACL: PERMIT:ALL +TGID_TS1_ACL: DENY:ALL +TGID_TS2_ACL: PERMIT:9990 +DEFAULT_UA_TIMER: 1 +SINGLE_MODE: True +VOICE_IDENT: False +TS1_STATIC: +TS2_STATIC:9990 +DEFAULT_REFLECTOR: 0 ANNOUNCEMENT_LANGUAGE: en_GB +GENERATOR: 0 +ALLOW_UNREG_ID: True +PROXY_CONTROL: False +OVERRIDE_IDENT_TG: [D-APRS] MODE: MASTER diff --git a/config/ADN-SAMPLE-commented.cfg b/config/ADN-SAMPLE-commented.cfg index 9ef192e..e6e0e4a 100755 --- a/config/ADN-SAMPLE-commented.cfg +++ b/config/ADN-SAMPLE-commented.cfg @@ -228,37 +228,31 @@ OVERRIDE_IDENT_TG: [ECHO] -MODE: PEER +MODE: MASTER ENABLED: True -LOOSE: False +REPEAT: True +MAX_PEERS: 1 EXPORT_AMBE: False IP: 127.0.0.1 PORT: 54917 -MASTER_IP: 127.0.0.1 -MASTER_PORT: 54915 -PASSPHRASE: passw0rd -CALLSIGN: ECHO -RADIO_ID: 9990 -RX_FREQ: 449000000 -TX_FREQ: 444000000 -TX_POWER: 25 -COLORCODE: 1 -SLOTS: 1 -LATITUDE: 00.0000 -LONGITUDE: 000.0000 -HEIGHT: 0 -LOCATION: 9990 Parrot -DESCRIPTION: ECHO -URL: adn.systems -SOFTWARE_ID: 20170620 -PACKAGE_ID: MMDVM_ADN-Systems +PASSPHRASE: GROUP_HANGTIME: 5 -OPTIONS: USE_ACL: True +REG_ACL: DENY:1 SUB_ACL: DENY:1 -TGID_TS1_ACL: PERMIT:ALL -TGID_TS2_ACL: PERMIT:ALL +TGID_TS1_ACL: DENY:ALL +TGID_TS2_ACL: PERMIT:9990 +DEFAULT_UA_TIMER: 1 +SINGLE_MODE: True +VOICE_IDENT: False +TS1_STATIC: +TS2_STATIC:9990 +DEFAULT_REFLECTOR: 0 ANNOUNCEMENT_LANGUAGE: en_GB +GENERATOR: 0 +ALLOW_UNREG_ID: True +PROXY_CONTROL: False +OVERRIDE_IDENT_TG: [D-APRS] MODE: MASTER diff --git a/config/ADN-SAMPLE.cfg b/config/ADN-SAMPLE.cfg index c307bf5..46b8216 100755 --- a/config/ADN-SAMPLE.cfg +++ b/config/ADN-SAMPLE.cfg @@ -98,37 +98,31 @@ OVERRIDE_IDENT_TG: [ECHO] -MODE: PEER +MODE: MASTER ENABLED: True -LOOSE: False +REPEAT: True +MAX_PEERS: 1 EXPORT_AMBE: False IP: 127.0.0.1 PORT: 54917 -MASTER_IP: 127.0.0.1 -MASTER_PORT: 54915 -PASSPHRASE: passw0rd -CALLSIGN: ECHO -RADIO_ID: 9990 -RX_FREQ: 449000000 -TX_FREQ: 444000000 -TX_POWER: 25 -COLORCODE: 1 -SLOTS: 1 -LATITUDE: 00.0000 -LONGITUDE: 000.0000 -HEIGHT: 0 -LOCATION: 9990 Parrot -DESCRIPTION: ECHO -URL: adn.systems -SOFTWARE_ID: 20170620 -PACKAGE_ID: MMDVM_ADN-Systems +PASSPHRASE: GROUP_HANGTIME: 5 -OPTIONS: USE_ACL: True +REG_ACL: DENY:1 SUB_ACL: DENY:1 -TGID_TS1_ACL: PERMIT:ALL -TGID_TS2_ACL: PERMIT:ALL +TGID_TS1_ACL: DENY:ALL +TGID_TS2_ACL: PERMIT:9990 +DEFAULT_UA_TIMER: 1 +SINGLE_MODE: True +VOICE_IDENT: False +TS1_STATIC: +TS2_STATIC:9990 +DEFAULT_REFLECTOR: 0 ANNOUNCEMENT_LANGUAGE: en_GB +GENERATOR: 0 +ALLOW_UNREG_ID: True +PROXY_CONTROL: False +OVERRIDE_IDENT_TG: [D-APRS] MODE: MASTER diff --git a/config/parrot.cfg b/config/parrot.cfg index f9cab2b..4066944 100644 --- a/config/parrot.cfg +++ b/config/parrot.cfg @@ -163,29 +163,50 @@ RELAX_CHECKS: False # ACLs: # See comments in the GLOBAL stanza [PARROT] -MODE: MASTER +MODE: PEER +CALLSIGN: ECHO +RADIO_ID: 9990 ENABLED: True REPEAT: True +LOOSE: False +RX_FREQ: 449000000 +TX_FREQ: 444000000 +TX_POWER: 25 +COLORCODE: 1 +SLOTS: 2 +TS1_STATIC: +TS2_STATIC:9990 +LATITUDE: 00.0000 +LONGITUDE: 000.0000 +HEIGHT: 0 +LOCATION: 9990 Parrot +DESCRIPTION: ECHO +URL: adn.systems +SOFTWARE_ID: 20170620 +PACKAGE_ID: MMDVM_ADN-Systems +GROUP_HANGTIME: 5 MAX_PEERS: 1 EXPORT_AMBE: False IP: 127.0.0.1 PORT: 54915 +MASTER_IP: 127.0.0.1 +MASTER_PORT: 54917 PASSPHRASE: passw0rd -GROUP_HANGTIME: 5 USE_ACL: True REG_ACL: DENY:1 SUB_ACL: DENY:1 -TGID_TS1_ACL: PERMIT:ALL -TGID_TS2_ACL: PERMIT:ALL +TGID_TS1_ACL: DENY:ALL +TGID_TS2_ACL: PERMIT:9990 DEFAULT_UA_TIMER: 10 SINGLE_MODE: True VOICE_IDENT: False -TS1_STATIC: -TS2_STATIC: DEFAULT_REFLECTOR: 0 -GENERATOR: 1 +GENERATOR: 0 +OPTIONS:TS2=9990; ANNOUNCEMENT_LANGUAGE:en_GB ALLOW_UNREG_ID: True PROXY_CONTROL: False OVERRIDE_IDENT_TG: + +