From f5900039b96be8b188f9dcf299ccee1946eb8e1b Mon Sep 17 00:00:00 2001
From: W3AXL <29879554+W3AXL@users.noreply.github.com>
Date: Thu, 29 Jan 2026 20:41:14 -0500
Subject: [PATCH] updated submodules and ensure all NuGet package versions
match rc2-core
---
fnecore | 2 +-
rc2-core | 2 +-
rc2-dvm/Program.cs | 10 +++++++++-
rc2-dvm/Properties/launchSettings.json | 5 +++++
rc2-dvm/VirtualChannel.P25.cs | 2 +-
rc2-dvm/config.example.yml | 5 +++--
rc2-dvm/rc2-dvm.csproj | 5 +++--
7 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/fnecore b/fnecore
index d4b15e1..1f6e581 160000
--- a/fnecore
+++ b/fnecore
@@ -1 +1 @@
-Subproject commit d4b15e118ec7f493fc033dae7656b642efb109a7
+Subproject commit 1f6e5816fb0b418a34aec87201c799894fb29214
diff --git a/rc2-core b/rc2-core
index 186018d..7b7cb6a 160000
--- a/rc2-core
+++ b/rc2-core
@@ -1 +1 @@
-Subproject commit 186018d65334317dc0aad09308d7893712032c9e
+Subproject commit 7b7cb6a2a02d95c6eff526affc1690e1d0783aac
diff --git a/rc2-dvm/Program.cs b/rc2-dvm/Program.cs
index e4f3177..fffb4c2 100644
--- a/rc2-dvm/Program.cs
+++ b/rc2-dvm/Program.cs
@@ -168,13 +168,17 @@ public static void Runtime()
// Setup Logging
LoggerConfiguration logConfig = new LoggerConfiguration();
- logConfig.MinimumLevel.Debug();
+ logConfig.MinimumLevel.Verbose();
const string logTemplate = "{Level:u1}: {Timestamp:yyyy-MM-dd HH:mm:ss.fff} {Message}{NewLine}{Exception}";
// File Logging Config
LogEventLevel fileLevel = LogEventLevel.Information;
switch (config.Log.FileLevel)
{
+ case 0:
+ fileLevel = LogEventLevel.Verbose;
+ FneLogLevel = FneLogLevel.DEBUG;
+ break;
case 1:
fileLevel = LogEventLevel.Debug;
FneLogLevel = FneLogLevel.DEBUG;
@@ -208,6 +212,10 @@ public static void Runtime()
LogEventLevel dispLevel = LogEventLevel.Information;
switch (config.Log.DisplayLevel)
{
+ case 0:
+ dispLevel = LogEventLevel.Verbose;
+ FneLogLevel = FneLogLevel.DEBUG;
+ break;
case 1:
dispLevel = LogEventLevel.Debug;
FneLogLevel = FneLogLevel.DEBUG;
diff --git a/rc2-dvm/Properties/launchSettings.json b/rc2-dvm/Properties/launchSettings.json
index ad49847..5ee8cba 100644
--- a/rc2-dvm/Properties/launchSettings.json
+++ b/rc2-dvm/Properties/launchSettings.json
@@ -9,6 +9,11 @@
"commandName": "Project",
"commandLineArgs": "-c config-nx.yml",
"workingDirectory": "H:\\Git\\rc2-dvm\\rc2-dvm"
+ },
+ "rc2-dvm nx verbose": {
+ "commandName": "Project",
+ "commandLineArgs": "-c config-nx-verbose.yml",
+ "workingDirectory": "H:\\Git\\rc2-dvm\\rc2-dvm"
}
}
}
\ No newline at end of file
diff --git a/rc2-dvm/VirtualChannel.P25.cs b/rc2-dvm/VirtualChannel.P25.cs
index bd557c7..6ec7604 100644
--- a/rc2-dvm/VirtualChannel.P25.cs
+++ b/rc2-dvm/VirtualChannel.P25.cs
@@ -81,7 +81,7 @@ private void P25EncodeAudioFrame(short[] pcm16, uint srcId, uint dstId)
// Ensure samples are right length
if (pcm16.Length != FneSystemBase.MBE_SAMPLES_LENGTH)
{
- throw new ArgumentException("Input samples not proper length for MBE encoding!");
+ throw new ArgumentException($"Input samples not proper length for MBE encoding! Got {pcm16.Length} but need {FneSystemBase.MBE_SAMPLES_LENGTH}");
}
if (p25N > 17)
diff --git a/rc2-dvm/config.example.yml b/rc2-dvm/config.example.yml
index c8c87ad..ee1cc47 100644
--- a/rc2-dvm/config.example.yml
+++ b/rc2-dvm/config.example.yml
@@ -6,7 +6,8 @@
# Logging Configuration
#
# Logging Levels:
-# 1 - Debug
+# 0 - Verbose (Tons of log prints, only use when troubleshooting)
+# 1 - Debug (Still a lot of log prints, but less so than verbose)
# 2 - Message
# 3 - Informational
# 4 - Warning
@@ -23,7 +24,7 @@ log:
# Full path for the directory to store the activity log files.
activityFilePath: .
# Log filename prefix.
- fileRoot: dvm-rc2
+ fileRoot: rc2-dvm
#
# Network Configuration
diff --git a/rc2-dvm/rc2-dvm.csproj b/rc2-dvm/rc2-dvm.csproj
index 79cea50..ec165db 100644
--- a/rc2-dvm/rc2-dvm.csproj
+++ b/rc2-dvm/rc2-dvm.csproj
@@ -17,6 +17,7 @@
True
$(ExtraConstants)
True
+ true
@@ -38,11 +39,11 @@
-
+
-
+