diff --git a/org_fw/20240404_HotSpot_rt3s.yaml b/org_fw/20240407_HotSpot_rt3s.yaml similarity index 85% rename from org_fw/20240404_HotSpot_rt3s.yaml rename to org_fw/20240407_HotSpot_rt3s.yaml index 9b1d18f..fdeaf22 100644 --- a/org_fw/20240404_HotSpot_rt3s.yaml +++ b/org_fw/20240407_HotSpot_rt3s.yaml @@ -66,13 +66,156 @@ contacts: - dmr: {id: cont15, name: Europa, ring: false, type: GroupCall, number: 92} - dmr: {id: cont16, name: BM APRS, ring: true, type: PrivateCall, number: 262999} - dmr: {id: cont17, name: AnyCall, ring: false, type: AllCall, number: 16777215} + - dmr: {id: cont18, name: North America, ring: false, type: GroupCall, number: 93} + - dmr: {id: cont19, name: Australia NZ, ring: false, type: GroupCall, number: 95} + - dmr: {id: cont20, name: UK, ring: false, type: GroupCall, number: 235} + - dmr: {id: cont21, name: China, ring: false, type: GroupCall, number: 460} + - dmr: {id: cont22, name: Egypt, ring: false, type: GroupCall, number: 602} + - dmr: {id: cont23, name: Ecuador, ring: false, type: GroupCall, number: 740} + - dmr: {id: cont24, name: South Africa, ring: false, type: GroupCall, number: 655} + - dmr: {id: cont25, name: Ireland, ring: false, type: GroupCall, number: 272} + - dmr: {id: cont26, name: Bangladesh, ring: false, type: GroupCall, number: 470} groupLists: - - {id: grp1, name: TG_all, contacts: []} + - {id: grp1, name: TG_all, contacts: [cont3, cont4, cont5, cont6, cont7, cont8, cont11, cont13, cont14, cont15, cont18, cont19, cont20, cont21, cont22, cont23, cont24, cont25, cont26]} - {id: grp2, name: TG_TS1, contacts: []} - {id: grp3, name: TG_TS2, contacts: []} channels: - digital: id: ch1 + name: HotSpot Echo + rxFrequency: 433 + txFrequency: 433 + rxOnly: false + tyt: + loneWorker: false + autoScan: false + talkaround: true + dataCallConfirmed: false + privateCallConfirmed: false + emergencyAlarmConfirmed: false + displayPTTId: true + rxRefFrequency: Low + txRefFrequency: Low + tightSquelch: false + compressedUDPHeader: false + reverseBurst: true + killTone: Off + inCallCriterion: Always + allowInterrupt: true + dcdm: false + dcdmLeader: true + dmrSquelch: 1 + admit: Always + colorCode: 1 + timeSlot: TS1 + radioId: ! "" + contact: cont1 + power: Min + timeout: 0 + vox: 0 + - digital: + id: ch2 + name: HotSpot DL + rxFrequency: 433 + txFrequency: 433 + rxOnly: false + tyt: + loneWorker: false + autoScan: false + talkaround: true + dataCallConfirmed: false + privateCallConfirmed: false + emergencyAlarmConfirmed: false + displayPTTId: true + rxRefFrequency: Low + txRefFrequency: Low + tightSquelch: false + compressedUDPHeader: false + reverseBurst: true + killTone: Off + inCallCriterion: Always + allowInterrupt: true + dcdm: false + dcdmLeader: true + dmrSquelch: 1 + admit: Always + colorCode: 1 + timeSlot: TS1 + radioId: ! "" + groupList: grp1 + contact: cont3 + power: Low + timeout: 0 + vox: 0 + - digital: + id: ch3 + name: HotSpot Europe + rxFrequency: 433 + txFrequency: 433 + rxOnly: false + tyt: + loneWorker: false + autoScan: false + talkaround: true + dataCallConfirmed: false + privateCallConfirmed: false + emergencyAlarmConfirmed: false + displayPTTId: true + rxRefFrequency: Low + txRefFrequency: Low + tightSquelch: false + compressedUDPHeader: false + reverseBurst: true + killTone: Off + inCallCriterion: Always + allowInterrupt: true + dcdm: false + dcdmLeader: true + dmrSquelch: 1 + admit: Always + colorCode: 1 + timeSlot: TS1 + radioId: ! "" + groupList: grp1 + contact: cont15 + power: Low + timeout: 0 + vox: 0 + - digital: + id: ch4 + name: HotSpot All + rxFrequency: 433 + txFrequency: 433 + rxOnly: false + tyt: + loneWorker: false + autoScan: false + talkaround: true + dataCallConfirmed: false + privateCallConfirmed: false + emergencyAlarmConfirmed: false + displayPTTId: true + rxRefFrequency: Low + txRefFrequency: Low + tightSquelch: false + compressedUDPHeader: false + reverseBurst: true + killTone: Off + inCallCriterion: Always + allowInterrupt: true + dcdm: false + dcdmLeader: true + dmrSquelch: 1 + admit: Always + colorCode: 1 + timeSlot: TS1 + radioId: ! "" + groupList: grp1 + power: Low + timeout: 0 + vox: 0 + - digital: + id: ch5 name: DB0GK Echo rxFrequency: 438.36250000000001 txFrequency: 430.76249999999999 @@ -105,73 +248,7 @@ channels: timeout: 0 vox: 0 - digital: - id: ch2 - name: HotSpot Echo - rxFrequency: 433 - txFrequency: 433 - rxOnly: false - tyt: - loneWorker: false - autoScan: false - talkaround: true - dataCallConfirmed: false - privateCallConfirmed: false - emergencyAlarmConfirmed: false - displayPTTId: true - rxRefFrequency: Low - txRefFrequency: Low - tightSquelch: false - compressedUDPHeader: false - reverseBurst: true - killTone: Off - inCallCriterion: Always - allowInterrupt: true - dcdm: false - dcdmLeader: true - dmrSquelch: 1 - admit: Always - colorCode: 1 - timeSlot: TS1 - radioId: ! "" - contact: cont1 - power: Low - timeout: 0 - vox: 0 - - digital: - id: ch3 - name: HotSpot DL - rxFrequency: 433 - txFrequency: 433 - rxOnly: false - tyt: - loneWorker: false - autoScan: false - talkaround: true - dataCallConfirmed: false - privateCallConfirmed: false - emergencyAlarmConfirmed: false - displayPTTId: true - rxRefFrequency: Low - txRefFrequency: Low - tightSquelch: false - compressedUDPHeader: false - reverseBurst: true - killTone: Off - inCallCriterion: Always - allowInterrupt: true - dcdm: false - dcdmLeader: true - dmrSquelch: 1 - admit: Always - colorCode: 1 - timeSlot: TS1 - radioId: ! "" - contact: cont3 - power: Low - timeout: 0 - vox: 0 - - digital: - id: ch4 + id: ch6 name: DB0GK TS1 rxFrequency: 438.36250000000001 txFrequency: 430.76249999999999 @@ -204,7 +281,7 @@ channels: timeout: 0 vox: 0 - digital: - id: ch5 + id: ch7 name: DB0GK TS2 rxFrequency: 438.36250000000001 txFrequency: 430.76249999999999 @@ -237,7 +314,7 @@ channels: timeout: 0 vox: 0 - digital: - id: ch6 + id: ch8 name: DB0WTL TS1 rxFrequency: 439.21249999999998 txFrequency: 431.61250000000001 @@ -270,7 +347,7 @@ channels: timeout: 0 vox: 0 - digital: - id: ch7 + id: ch9 name: DB0WTL TS2 rxFrequency: 439.21249999999998 txFrequency: 431.61250000000001 @@ -303,7 +380,7 @@ channels: timeout: 0 vox: 0 - digital: - id: ch8 + id: ch10 name: DB0ODE TS1 rxFrequency: 439.92500000000001 txFrequency: 430.52499999999998 @@ -336,7 +413,7 @@ channels: timeout: 0 vox: 0 - digital: - id: ch9 + id: ch11 name: DB0ODE TS2 rxFrequency: 439.92500000000001 txFrequency: 430.52499999999998 @@ -369,7 +446,7 @@ channels: timeout: 0 vox: 0 - analog: - id: ch10 + id: ch12 name: DM0FG FM rxFrequency: 439.36250000000001 txFrequency: 431.76249999999999 @@ -400,7 +477,7 @@ channels: vox: ! "" squelch: 1 - analog: - id: ch11 + id: ch13 name: DBOGK FM rxFrequency: 439.42500000000001 txFrequency: 431.82499999999999 @@ -431,7 +508,7 @@ channels: vox: ! "" squelch: 1 - analog: - id: ch12 + id: ch14 name: DBONP FM rxFrequency: 439.14999999999998 txFrequency: 431.55000000000001 @@ -462,7 +539,7 @@ channels: vox: ! "" squelch: 1 - analog: - id: ch13 + id: ch15 name: DBOLBY FM rxFrequency: 438.4375 txFrequency: 430.83749999999998 @@ -493,7 +570,7 @@ channels: vox: ! "" squelch: 1 - analog: - id: ch14 + id: ch16 name: DB0ODE FM rxFrequency: 438.82499999999999 txFrequency: 431.22500000000002 @@ -524,7 +601,7 @@ channels: vox: ! "" squelch: 1 - analog: - id: ch15 + id: ch17 name: DBONP FM rxFrequency: 439.14999999999998 txFrequency: 431.55000000000001 @@ -556,13 +633,13 @@ channels: squelch: 1 zones: - id: zone1 - name: Home - A: [ch4, ch5, ch6, ch7, ch8, ch9, ch1] - B: [ch10, ch11, ch12, ch13, ch14] - - id: zone2 name: HotSpot - A: [ch2] - B: [ch3] + A: [ch2, ch3, ch4] + B: [ch1] + - id: zone2 + name: Home + A: [ch6, ch7, ch8, ch9, ch10, ch11, ch5] + B: [ch12, ch13, ch14, ch15, ch16] commercial: encryptionKeys: []