Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MINOR] Release 1.3.0 #90

Merged
merged 101 commits into from
Apr 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
8dc6b31
Update build.bat
Sinderion Oct 14, 2023
d7b6701
Fixed build.bat
FPGSchiba Oct 14, 2023
c62fe88
Fixed Intercom VOX Button
FPGSchiba Oct 16, 2023
c349aaf
Begun Multi Overlay Implementation
FPGSchiba Oct 20, 2023
3baf66c
Finished Multi Panels
FPGSchiba Oct 21, 2023
befc0ae
Merge pull request #46 from FPGSchiba/feature/radio-panels
FPGSchiba Nov 5, 2023
16b57e7
Added configurable Upper Intercom Limit
FPGSchiba Nov 6, 2023
ba57da2
Merge branch 'develop' into feature/adjusting-intercom-channels
FPGSchiba Nov 6, 2023
9b3922c
Fixed Issue 51 and 49
FPGSchiba Nov 6, 2023
316fa16
Merge pull request #53 from FPGSchiba/bugfix/functional-vox-button
Dabble1SC Nov 6, 2023
83bb663
Merge pull request #52 from FPGSchiba/feature/adjusting-intercom-chan…
Dabble1SC Nov 6, 2023
fe558b6
Intercom Upper limit to 1000
FPGSchiba Nov 7, 2023
007ff2b
Fixed multiple Transitions
FPGSchiba Nov 7, 2023
cc22be5
Merge pull request #60 from FPGSchiba/bugfix/double-transmission
Dabble1SC Nov 7, 2023
30ffbad
Implemented Disabeling of radios
FPGSchiba Nov 7, 2023
d5772a9
Merge branch 'develop' into feature/disabling-radios
FPGSchiba Nov 7, 2023
ecf90e0
Made Button Smaller
FPGSchiba Nov 7, 2023
ad91eb3
Merge pull request #62 from FPGSchiba/feature/disabling-radios
FPGSchiba Nov 7, 2023
d90f513
Update vngd-channels.txt
Dabble1SC Nov 8, 2023
b63fba9
Added two silent variants of Radio TX & RX
Dabble1SC Nov 8, 2023
fbf2df2
Update vngd-channels.txt
Dabble1SC Nov 8, 2023
bea5c8f
Update vngd-channels.txt
Dabble1SC Nov 8, 2023
74861c2
added silent variants to two files:
Dabble1SC Nov 8, 2023
6ec202e
Merge pull request #66 from FPGSchiba/feature/61-add-radio-tx-rx-sile…
FPGSchiba Nov 8, 2023
7cfeb11
Merge pull request #67 from FPGSchiba/feature/updated-vngd-channels.txt
FPGSchiba Nov 8, 2023
7c84d6c
Updated Help Tab text
Dabble1SC Nov 8, 2023
79a5598
Merge pull request #69 from FPGSchiba/Update-Help-Tab
Dabble1SC Nov 23, 2023
aebdf6d
add orientation change btn for 2 vert and 2 hort
gtodd876 Nov 24, 2023
d0a67c1
Remove testing code
gtodd876 Nov 24, 2023
a08cc16
- swapped orientation icon to a version clearer at small sizes
Dabble1SC Nov 24, 2023
b98d08f
Adjusted 3 Horizontal radio panel radio panel intercom layout.
Dabble1SC Nov 24, 2023
5c397a9
added 1 radio panel variants (horizontal and vertical)
Dabble1SC Nov 25, 2023
eeaba62
Added ultrawide radio panels variants for 10 radios
Dabble1SC Nov 25, 2023
d656399
pass toggleoverlay to radio layout
gtodd876 Nov 25, 2023
b61ffb1
remove new lines
gtodd876 Nov 25, 2023
a3de66f
Remove new line
gtodd876 Nov 25, 2023
4ff3ab4
updated min height to match panel height on 10H Wide panel
Dabble1SC Nov 25, 2023
7692c4b
Merge pull request #73 from FPGSchiba/feature/72-add-a-new-intercom-v…
Dabble1SC Nov 25, 2023
c6d5172
Added logging functionality for all additional panels
Dabble1SC Nov 26, 2023
591a5b8
Add orientation btns to 3,5,10 panels
gtodd876 Nov 26, 2023
1d3a8a1
Merge branch 'develop' into volts-issue48
FPGSchiba Nov 26, 2023
e221202
Merge pull request #71 from FPGSchiba/volts-issue48
gtodd876 Nov 26, 2023
cb76e28
Added logger functions to 1H panel opening sequence
Dabble1SC Nov 26, 2023
f57d4af
Merge branch 'develop' into feature/74-add-1-radio-panel-vertical-hor…
FPGSchiba Nov 26, 2023
6fffc04
Fixed Client Project Compile Settings
FPGSchiba Nov 26, 2023
6532953
Added default Settings and ToDos
FPGSchiba Nov 26, 2023
9482c82
Merge pull request #75 from FPGSchiba/feature/74-add-1-radio-panel-ve…
Dabble1SC Nov 26, 2023
74e1aed
adjusted names in the help tab
Dabble1SC Nov 26, 2023
469c6b8
Merge pull request #78 from FPGSchiba/feature/adjust-help-tab-text
Dabble1SC Nov 26, 2023
6a13e1b
tightened up 2H panel + fixed 2H>2V toggle
Dabble1SC Nov 26, 2023
7311a0d
Merge pull request #79 from FPGSchiba/bugfix/2H-panel-change
gtodd876 Nov 26, 2023
0a1dcb3
Merge branch 'master' into develop
FPGSchiba Nov 26, 2023
6b6890e
updated radio panel naming logic based upon connection status
Dabble1SC Nov 26, 2023
b4beac5
Added Debug Console Start
FPGSchiba Nov 26, 2023
6a3bcd1
Removed Unnecessary logs
FPGSchiba Nov 26, 2023
2c7f4ad
Semicolon fix
FPGSchiba Nov 26, 2023
d6234af
#80 | Fixed issue
FPGSchiba Nov 26, 2023
3d01d23
Merge pull request #82 from FPGSchiba/bugfix/panel-crashes
Dabble1SC Nov 26, 2023
4c4e54b
Merge pull request #81 from FPGSchiba/bugfix/76-fix-radio-panel-headers
Dabble1SC Nov 26, 2023
7807b5c
Simple Radio Panel GUI updates
Dabble1SC Nov 27, 2023
d88d3c7
draft panel created
Dabble1SC Nov 27, 2023
ed97cf2
Merge pull request #83 from FPGSchiba/feature/76-fix-radio-panel-head…
gtodd876 Nov 27, 2023
2741d1b
Add orientation swap to 1, 10HW, 10VL
gtodd876 Nov 27, 2023
dcc752d
silly manual formatting needed in xam files
gtodd876 Nov 27, 2023
bf86a2b
more formatting of xaml
gtodd876 Nov 27, 2023
b78e3a8
Merge pull request #86 from FPGSchiba/feature/volts-add-more-orientat…
gtodd876 Nov 27, 2023
8ae1786
misc updates
Dabble1SC Nov 27, 2023
9d3737a
simple adjustment of 10HW header width
Dabble1SC Nov 27, 2023
9a29ea9
updated transparent panel GUI
Dabble1SC Nov 27, 2023
0c7c8f0
updated mainwindow windowstate
Dabble1SC Nov 27, 2023
227b54a
adjusted opacity settings for 10T panel
Dabble1SC Nov 27, 2023
bba531e
added initial mousewheel freq adjustments code
Dabble1SC Nov 28, 2023
027efb4
added various comments
Dabble1SC Nov 28, 2023
02dcf77
Fixed Panel
FPGSchiba Nov 28, 2023
5f98f6a
Merge branch 'develop' into feature/transparent-radio-panel
FPGSchiba Nov 28, 2023
cdfc6fe
separated text and background opacity
Dabble1SC Nov 28, 2023
7077878
adjusted GUI for show all radios
Dabble1SC Nov 28, 2023
a85d3cb
Power switch auto hides radio
Dabble1SC Nov 29, 2023
43228b8
functional show/hide button
Dabble1SC Nov 30, 2023
40fe312
started work on adding channel dropdown
Dabble1SC Nov 30, 2023
d11c6cb
added expansion and contraction functions
Dabble1SC Dec 2, 2023
b58e297
added dropdown functionality for transparent radio panel
Dabble1SC Dec 2, 2023
7254d4f
lengthened mainwindow height to fit all elements
Dabble1SC Dec 2, 2023
7458853
moved audio settings from main window to settings tab
Dabble1SC Dec 2, 2023
4c2d24d
added tooltips to the transparent radio dropdown and refresh buttons
Dabble1SC Dec 2, 2023
6b17a2e
#84 | Added Scale Calculations
FPGSchiba Dec 2, 2023
3b94498
#84 | Changed radio off text from Unknown to Off
Dabble1SC Dec 3, 2023
97c6723
#84 | Updated 10T window close saving states
Dabble1SC Dec 4, 2023
6bb0b73
Added keybind categories and adjust order of keybinds
Dabble1SC Dec 4, 2023
4bab708
prep work on creating transparent radio panel toggle keybind
Dabble1SC Dec 4, 2023
1caa7ca
Bugfix - channel dropdown opacity changes with text transparency slider
Dabble1SC Dec 4, 2023
55c2077
adjusted formating and order of keybinds
Dabble1SC Dec 4, 2023
6395c69
Update vngd-channels.txt
Dabble1SC Dec 4, 2023
efa4ab6
Merge pull request #87 from FPGSchiba/feature/58--Update-keybinding-n…
gtodd876 Dec 4, 2023
0ef4647
#84 | Updated xscale ratio to match other panels
Dabble1SC Dec 4, 2023
35eddfb
Fix PTT bug on disabled radio
gtodd876 Dec 5, 2023
3c9e2f7
Update vngd-channels.txt
Dabble1SC Dec 7, 2023
b7013e6
Update vngd-channels.txt
Dabble1SC Dec 7, 2023
2bff004
Merge pull request #89 from FPGSchiba/bugix/ptt-fix
Dabble1SC Dec 7, 2023
794e5f1
Merge pull request #84 from FPGSchiba/feature/transparent-radio-panel
Dabble1SC Jan 6, 2024
722d4bb
Merge branch 'master' into develop
FPGSchiba Mar 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions DCS-SR-Client/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,15 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:DCS_SR_Client"
StartupUri="UI/ClientWindow/MainWindow.xaml">
StartupUri="UI/ClientWindow/MainWindow.xaml"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<!-- Use this instead of the MahApps.Metro styles to rework a better UI -->
<ui:ThemesDictionary Theme="Light" />
<ui:ControlsDictionary />

<!-- MahApps.Metro resource dictionaries. Make sure that all file names are Case Sensitive! -->
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
Expand All @@ -26,7 +31,6 @@
Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseLight.xaml" />

<ResourceDictionary Source="Themes\Styles.xaml" />

</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
Expand Down
32 changes: 26 additions & 6 deletions DCS-SR-Client/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Linq.Expressions;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Security.Principal;
using System.Text;
using System.Threading;
Expand All @@ -16,6 +15,7 @@
using NLog.Targets;
using NLog.Targets.Wrappers;
using Sentry;
using static Standard.NtDll;

namespace DCS_SR_Client
{
Expand Down Expand Up @@ -62,6 +62,8 @@ public App()
ListArgs();

#if !DEBUG
FreeConsole();

if (IsClientRunning())
{
//check environment flag
Expand Down Expand Up @@ -231,19 +233,32 @@ private void SetupLogging()
}

var config = new LoggingConfiguration();
var consoleTarget = new ConsoleTarget
{
Encoding = Encoding.UTF8,
WriteBuffer = false,
DetectConsoleAvailable = true,
Name = "consoleTarget",
StdErr = false,
Layout = @"${longdate} | ${logger} | ${message} ${exception:format=toString,Data:maxInnerExceptionLevel=1}"
};
var consoleWrapper = new AsyncTargetWrapper(consoleTarget, 5000, AsyncTargetWrapperOverflowAction.Discard);
config.AddTarget("asyncConsoleTarget", consoleWrapper);
config.LoggingRules.Add(new LoggingRule("*", LogLevel.Trace, consoleWrapper));

var fileTarget = new FileTarget
{
FileName = "clientlog.txt",
ArchiveFileName = "clientlog.old.txt",
MaxArchiveFiles = 1,
ArchiveAboveSize = 104857600,
Layout =
@"${longdate} | ${logger} | ${message} ${exception:format=toString,Data:maxInnerExceptionLevel=1}"
@"${longdate} | ${logger} (${level}) | ${message} ${exception:format=toString,Data:maxInnerExceptionLevel=1}"
};

var wrapper = new AsyncTargetWrapper(fileTarget, 5000, AsyncTargetWrapperOverflowAction.Discard);
config.AddTarget("asyncFileTarget", wrapper);
config.LoggingRules.Add( new LoggingRule("*", LogLevel.Info, wrapper));
var fileWrapper = new AsyncTargetWrapper(fileTarget, 5000, AsyncTargetWrapperOverflowAction.Discard);
config.AddTarget("asyncFileTarget", fileWrapper);
config.LoggingRules.Add( new LoggingRule("*", LogLevel.Info, fileWrapper));

LogManager.Configuration = config;
loggingReady = true;
Expand Down Expand Up @@ -306,11 +321,16 @@ protected override void OnExit(ExitEventArgs e)

private void UnhandledExceptionHandler(object sender, UnhandledExceptionEventArgs e)
{
MessageBox.Show("This is a sample and can be expanded ;)\n If you see this, please let FPGSchiba know how you did it :D");

if (loggingReady)
{
Logger logger = LogManager.GetCurrentClassLogger();
logger.Error((Exception) e.ExceptionObject, "Received unhandled exception, {0}", e.IsTerminating ? "exiting" : "continuing");
}
}

[DllImport("kernel32.dll", SetLastError = true)]
internal static extern int FreeConsole();
}
}
3 changes: 1 addition & 2 deletions DCS-SR-Client/Audio/Managers/AudioManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -343,11 +343,10 @@ private void WasapiCaptureOnDataAvailable(object sender, WaveInEventArgs e)
try
{
//ready for the buffer shortly

//check for voice before any pre-processing
bool voice = _globalSettings.GetClientSettingBool(GlobalSettingsKeys.VOXR1) || _globalSettings.GetClientSettingBool(GlobalSettingsKeys.VOXIC);

if (voice) // VOX Setting here
if (voice && !_udpVoiceHandler._ptt) // VOX Setting here
{
Buffer.BlockCopy(_pcmShort, 0, _pcmBytes, 0, _pcmBytes.Length);
voice = DoesFrameContainSpeech(_pcmBytes, _pcmShort);
Expand Down
Binary file not shown.
Binary file not shown.
Binary file added DCS-SR-Client/ContractIcon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading