ShaYmez/RYSEN
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
374 Commits 1 Branch 0 Tags 3.1 MiB
0fa46e666f
Commit Graph

225 Commits

Author SHA1 Message Date
Simon
eada4ce1d3 force 2021-03-26 11:36:09 +00:00
Simon
60ccdb9886 Tidy up loop control logging 2021-03-26 11:19:07 +00:00
Simon
2d2d34aa3d Upgrade log level for fin logging 2021-03-26 11:03:26 +00:00
Simon
6f8cf555d4 typo 2021-03-26 10:59:56 +00:00
Simon
3e9dd4e357 More work on finished stream handling 2021-03-26 10:58:20 +00:00
Simon
63a124dcde Define fin_list 2021-03-26 10:45:28 +00:00
Simon
dd8b0ebdf2 remove fin list 2021-03-25 23:02:17 +00:00
Simon
f9beefe96a well placed continue 2021-03-25 22:59:41 +00:00
Simon
e57ae29486 systems 2021-03-25 22:53:07 +00:00
Simon
092248b3ce Handle stream end properly 2021-03-25 22:51:41 +00:00
Simon
339ed8b9ce Revert "Stop double-logging voice start" 
This reverts commit b67ad6e787.
 2021-03-25 22:42:59 +00:00
Simon
4f460183c3 Revert "End only needed once" 
This reverts commit ed3894e3b6.
 2021-03-25 22:42:58 +00:00
Simon
ed3894e3b6 End only needed once 2021-03-25 19:29:07 +00:00
Simon
b67ad6e787 Stop double-logging voice start 2021-03-25 19:10:46 +00:00
Simon
bec116337e Incorporate Loop Control !! 
Squashed commit of the following:

commit da52307f858da5ef4f23950ff94c3c1dd78650a2
Author: Simon <simon@gb7fr.org.uk>
Date:   Wed Mar 24 18:14:42 2021 +0000

    Revert "Log UA Timer when logging bridge timer events"

    This reverts commit 8e1e96d9202afdbd2d88c73bba2abe7000718d89.

commit 79a2efcd03c736fd8f3a0187fd0b7c0033b43604
Author: Simon <simon@gb7fr.org.uk>
Date:   Wed Mar 24 18:14:41 2021 +0000

    Revert "Tidy up commented out code"

    This reverts commit c54353bddc3cb9f424a1b9087e30308b1da0f083.

commit 5081af43a9ed6a1ff62300876d089f18aeaec09f
Author: Simon <simon@gb7fr.org.uk>
Date:   Wed Mar 24 18:14:36 2021 +0000

    Revert "No UA timer on STAT bridges"

    This reverts commit 97f84c97e583ef45b5eaa57c60da24b2546a537f.

commit b605432e0fa2107928274bf848c094d5ec2bf919
Author: Simon <simon@gb7fr.org.uk>
Date:   Wed Mar 24 18:14:31 2021 +0000

    Revert "One missing"

    This reverts commit a479882017a9637107bb51e971402bf20b55d592.

commit a479882017a9637107bb51e971402bf20b55d592
Author: Simon <simon@gb7fr.org.uk>
Date:   Wed Mar 24 18:11:14 2021 +0000

    One missing

commit 97f84c97e583ef45b5eaa57c60da24b2546a537f
Author: Simon <simon@gb7fr.org.uk>
Date:   Wed Mar 24 18:06:38 2021 +0000

    No UA timer on STAT bridges

commit c54353bddc3cb9f424a1b9087e30308b1da0f083
Author: Simon <simon@gb7fr.org.uk>
Date:   Wed Mar 24 18:01:21 2021 +0000

    Tidy up commented out code

commit 8e1e96d9202afdbd2d88c73bba2abe7000718d89
Author: Simon <simon@gb7fr.org.uk>
Date:   Wed Mar 24 17:45:53 2021 +0000

    Log UA Timer when logging bridge timer events

commit 869fa90277bb72a104d0e4eb0bf91a54671f55b2
Author: Simon <simon@gb7fr.org.uk>
Date:   Wed Mar 24 09:25:05 2021 +0000

    RX_STREAM_ID keyerror

commit 6777f5892c0e64899372758a408d240ebae79704
Merge: 4bf055e 415346f
Author: Simon <simon@gb7fr.org.uk>
Date:   Wed Mar 24 09:05:27 2021 +0000

    Merge branch 'master' into loopy

commit 4bf055ede46b6cf31269def0b59ae6db738d3e8c
Author: Simon <simon@adlem.net>
Date:   Mon Feb 22 11:36:22 2021 +0000

    Revert "Log packet time"

    This reverts commit 59de64990df5cbdaf91d487254e4f0a08c3b7e73.

commit 59de64990df5cbdaf91d487254e4f0a08c3b7e73
Author: Simon <simon@adlem.net>
Date:   Mon Feb 22 11:07:26 2021 +0000

    Log packet time

commit df4b8ff525f7e6611ed1f1cfc006469695974b5e
Author: Simon <simon@adlem.net>
Date:   Mon Feb 22 10:51:53 2021 +0000

    Raise KeyError level for streamid to warning

commit 66c82257cf9f795efb6c68f077ade90681dc52cb
Author: Simon <simon@adlem.net>
Date:   Sun Feb 21 23:22:11 2021 +0000

    Only log once

commit 9989a3d06f106519dbabd4e5b83edd90205cc7ed
Author: Simon <simon@adlem.net>
Date:   Sun Feb 21 23:10:10 2021 +0000

    L

commit e61255ea761f084e20be3c0d943a8d1385695e1e
Author: Simon <simon@adlem.net>
Date:   Sun Feb 21 22:45:32 2021 +0000

    Try again

commit 7824304884d075a2ea99b2f56aa8d006b69aa979
Author: Simon <simon@adlem.net>
Date:   Sun Feb 21 22:23:48 2021 +0000

    compare streamid correctly

commit de23e7a1536306c7523fa1ff0638d84986809b2b
Author: Simon <simon@adlem.net>
Date:   Sun Feb 21 22:15:29 2021 +0000

    Disgard if stream was sourced from this system via HBP

commit 2a5e51b3c16fabd63b6ec69709ff52b734f025c3
Author: Simon <simon@adlem.net>
Date:   Sun Feb 21 19:36:19 2021 +0000

    Revert "Tidy up from loop control work"

    This reverts commit 3f43d86c71ac30b997c11a0dbd75dbe0a0be699d.

commit 3f43d86c71ac30b997c11a0dbd75dbe0a0be699d
Author: Simon <simon@adlem.net>
Date:   Sun Feb 21 19:23:37 2021 +0000

    Tidy up from loop control work

commit e7d25b2b1c40ab488d42d57b3bf1abbe10828955
Author: Simon <simon@adlem.net>
Date:   Sun Feb 21 18:44:43 2021 +0000

    Fix what I broke - voice

commit 01f8620ee5068bc58c7c2e53ecb891cb25648423
Author: Simon <simon@adlem.net>
Date:   Sun Feb 21 16:55:39 2021 +0000

    lop

commit 234e528547641e017525c5c6d56e79f0a3f74ae1
Merge: d71d7c1 2f1b128
Author: Simon <simon@adlem.net>
Date:   Sun Feb 21 16:30:42 2021 +0000

    Merge branch 'master' into loopy

commit d71d7c10799706439c9fd32c7e955ef3cbfbc840
Author: Simon <simon@adlem.net>
Date:   Sat Feb 20 21:05:02 2021 +0000

    Fix speech issue

commit f5f354592e2dc2099db3576a3e93eba0d25c281b
Author: Simon <simon@adlem.net>
Date:   Mon Feb 15 10:40:16 2021 +0000

    LoopHold should be an integer

commit 5455b3920876bfc41f9e48ef9605fddbbb7772c7
Author: Simon <simon@adlem.net>
Date:   Mon Feb 15 10:35:14 2021 +0000

    5 packet loophold for rebound packets

commit 7aa8c65cef58bdebb37361fc1ca3ac5198fb3aab
Author: Simon <simon@adlem.net>
Date:   Mon Feb 15 10:28:47 2021 +0000

    No square brackets in loophold

commit 096fae4dc99ac6f20fa1430fe8cbebc240099a3b
Author: Simon <simon@adlem.net>
Date:   Mon Feb 15 10:27:01 2021 +0000

    Loophold top stop rebound packets

commit c6284ea4c1d1f301b5112a11f0a71144224d71ad
Author: Simon <simon@adlem.net>
Date:   Mon Feb 15 10:10:43 2021 +0000

    Further typo in last change

commit 1ef70d4bdd8bc465a101aa2ab46dd275634a75d8
Author: Simon <simon@adlem.net>
Date:   Mon Feb 15 10:08:37 2021 +0000

    Typo in keyerror string

commit ac76346cbd60ee56c622912fe7addda9751de880
Author: Simon <simon@adlem.net>
Date:   Mon Feb 15 01:25:47 2021 +0000

    TGID

commit f9a654aa9069dd29e9e921516e81033e1e3b81d8
Author: Simon <simon@adlem.net>
Date:   Mon Feb 15 00:18:33 2021 +0000

    1st

commit 19060a430d350a16611816bed789246c00c58cd5
Author: Simon <simon@adlem.net>
Date:   Mon Feb 15 00:14:24 2021 +0000

    Whitespace!

commit e682f6924125242b5846123d0c031f99733b5a30
Author: Simon <simon@adlem.net>
Date:   Sun Feb 14 23:37:33 2021 +0000

    Revert "Revert "b+""

    This reverts commit 312483086181c3f9cd1136e29c6574781e637e60.

commit c6b7863ab34c6aceeaae8c39d00c9ef7a12bd62c
Author: Simon <simon@adlem.net>
Date:   Sun Feb 14 23:36:59 2021 +0000

    Revert "Revert "TGID2""

    This reverts commit d10091ff5e1f09c88da38f2a7fbe4e4e58d85dfa.

commit ecae036c4cb193940137bb157778969986817bf4
Author: Simon <simon@adlem.net>
Date:   Sun Feb 14 23:36:46 2021 +0000

    Revert "Revert "tgid""

    This reverts commit 1059c0c552e2db4bf74de539dd618bd2b4fc3a18.

commit 4466c029d9e04715e879ffb8b82b57c62464bbb6
Author: Simon <simon@adlem.net>
Date:   Sun Feb 14 23:36:36 2021 +0000

    Revert "Revert "f""

    This reverts commit b7c60f4dd3281273aa67d5e6c9e2f8137f6e69cf.

commit b7c60f4dd3281273aa67d5e6c9e2f8137f6e69cf
Author: Simon <simon@adlem.net>
Date:   Sun Feb 14 23:32:02 2021 +0000

    Revert "f"

    This reverts commit 35a10397e92b634b56cd6c4631ee36b12c87d8df.

commit 1059c0c552e2db4bf74de539dd618bd2b4fc3a18
Author: Simon <simon@adlem.net>
Date:   Sun Feb 14 23:30:58 2021 +0000

    Revert "tgid"

    This reverts commit b427a63584d2715900ee8a599181ef7332267bb2.

commit d10091ff5e1f09c88da38f2a7fbe4e4e58d85dfa
Author: Simon <simon@adlem.net>
Date:   Sun Feb 14 23:30:38 2021 +0000

    Revert "TGID2"

    This reverts commit 0da3a895a1c8941f135798a4f8728916ae01a630.

commit 312483086181c3f9cd1136e29c6574781e637e60
Author: Simon <simon@adlem.net>
Date:   Sun Feb 14 23:30:19 2021 +0000

    Revert "b+"

    This reverts commit 3e62cd48d60adb3e9d39960e2e6a54b813e03075.

commit 3e62cd48d60adb3e9d39960e2e6a54b813e03075
Author: Simon <simon@adlem.net>
Date:   Sun Feb 14 23:29:04 2021 +0000

    b+

commit 0da3a895a1c8941f135798a4f8728916ae01a630
Author: Simon <simon@adlem.net>
Date:   Sun Feb 14 23:26:01 2021 +0000

    TGID2

commit b427a63584d2715900ee8a599181ef7332267bb2
Author: Simon <simon@adlem.net>
Date:   Sun Feb 14 23:24:31 2021 +0000

    tgid

commit 35a10397e92b634b56cd6c4631ee36b12c87d8df
Author: Simon <simon@adlem.net>
Date:   Sun Feb 14 23:11:23 2021 +0000

    f

commit 46c33c1aa92071e364af2f87f5f612bb01513242
Author: Simon <simon@adlem.net>
Date:   Sun Feb 14 22:52:02 2021 +0000

    lo
 2021-03-24 18:19:18 +00:00
Simon
415346f458 Rstrip is a better solution for \x00 2021-03-21 20:39:16 +00:00
Simon
6a7f893b27 Tidy up some logging 2021-03-21 17:39:31 +00:00
Simon
b0d3c56982 Remove null bytes from options line (For you OpenSpot!) 2021-03-21 17:26:22 +00:00
Simon
0261c04ede When using a GENERATOR config, reset HBP options to default on client logout 2021-03-21 17:22:50 +00:00
Simon
7a314ba7df Fix SINGLE error in options 2021-03-20 17:00:05 +00:00
Simon
be6d58114e Add SINGLE to options 2021-03-13 11:35:12 +00:00
Simon
530d79313d Missing tmout 2021-03-12 17:35:27 +00:00
Simon
2cc471e9b8 Handle variable types 2021-03-07 16:24:54 +00:00
Simon
0090f1a65d Options support update: 
New format:

TS1=;TS2=2350;DIAL=0;TIMER=12;VOICE=0

Old format is still supported

Also support for DMR+ format
 2021-03-07 16:11:30 +00:00
Simon
40963656f1 Only bridge to OBP TGs > 89 2021-03-01 18:34:47 +00:00
Simon
def3e27e82 XLX working 2021-02-28 23:04:45 +00:00
Simon
ed7c371966 XLX work 2021-02-28 12:05:03 +00:00
Simon
638e585a46 Take callsign for voice ident from callsign sent in connection 
rather than from system name. Now it will work with proxy setups too!
 2021-02-26 19:13:58 +00:00
Simon
668d52c2ba We need to deepcopy() when using GENERATE 2021-02-24 22:24:19 +00:00
Simon
6ad5af1b2b Don't allow decimal point / full stop in TG in options 2021-02-23 15:31:58 +00:00
Simon
a4fe1995d2 Fix voice - again 2021-02-21 18:52:37 +00:00
Simon
b719a55e4c Add GENERATOR: N in MASTER deifnition 
If GENERATOR is set to more than 1, the master definiton
is used as a template to generate N systems with sequential ports,
starting at the port listed in the defintion.

For example:

for N = 2:

G7RZU-0 - port 54000
G7RZU-1 - port 54001
 2021-02-21 14:33:53 +00:00
Simon
2e3806cf4e Only process type MASTER in options config. 
This should enable type PEER and type XLXPEER to be used
 2021-02-21 12:35:04 +00:00
Simon
91dc7129bb Fix voices 2021-02-20 21:18:08 +00:00
Simon
0600332980 Internationalisation map 2021-02-14 15:42:43 +00:00
Simon
116a904d9f further typo 2021-02-14 13:20:51 +00:00
Simon
ed85784edf typo 2021-02-14 13:19:28 +00:00
Simon
acab830ef9 Only update UA timer when it's acptually changed ! 2021-02-14 13:18:26 +00:00
Simon
72fe31509b More fixes on options default timer handling 2021-02-14 13:13:12 +00:00
Simon
41d24ddec2 Options UA TIMER handling fix 2021-02-14 12:07:06 +00:00
Simon
fb45584aab Revert "Remove "to" from linked messages so it at least makes sense" 
This reverts commit e882b4226b.
 2021-02-09 09:37:44 +00:00
Simon
e882b4226b Remove "to" from linked messages so it at least makes sense 
for all languages and doesn't cause to - two confusion
 2021-02-08 14:41:23 +00:00
Simon
0b1015b5af Tidy up announcement voice sending 
Including setting streamid variables within main reactor thread for consistency
 2021-01-28 01:27:10 +00:00
Simon
23ac74dfdf Explicit returns in SQL thread 2021-01-27 21:30:37 +00:00
Simon
75bbc8baad Fix voice file support 2021-01-27 21:08:46 +00:00
Simon
a74c02d28c Change language of voice announcements in config file 
(See ./Audio/ )
 2021-01-27 19:55:09 +00:00
Simon
67db3f1acd Outline of language file support 
Move sql.close() into SQL thread
 2021-01-27 19:49:02 +00:00
Simon
91fe2e6f9d Get rid of Semaphores completely. 2021-01-27 18:54:31 +00:00
Simon
d3bc7fe5d8 All blocking code removed from main thread 
What was I actually thinking ?!?!?
 2021-01-27 18:47:55 +00:00
Simon
799a48b91d Indent error in sendspeec logging 2021-01-25 13:30:21 +00:00