Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 9 additions & 8 deletions console/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,16 @@
"productName": "RadioConsole2 GUI",
"copyright": "Copyright © 2023 W3AXL",
"win": {
"publisherName": "W3AXL",
"target": [
"portable"
],
"icon": "console-icon-576x576.png"
},
"linux": {
"icon": "console-icon-576x576.png",
"target": ["AppImage"]
"target": [
"AppImage"
]
},
"portable": {
"artifactName": "rc2-console.exe"
Expand All @@ -37,14 +38,14 @@
},
"keywords": [],
"devDependencies": {
"cross-env": "^7.0.3",
"electron": "^28.3.3",
"electron-builder": "^25.1.8"
"cross-env": "^10.1.0",
"electron": "^35.7.5",
"electron-builder": "^26.8.1"
},
"dependencies": {
"electron-builder-squirrel-windows": "25.1.8",
"serialport": "^13.0.0",
"@julusian/midi": "^3.6.1"
"@julusian/midi": "^3.6.1",
"electron-builder-squirrel-windows": "26.8.1",
"serialport": "^13.0.0"
},
"pnpm": {
"neverBuiltDependencies": []
Expand Down
1,702 changes: 523 additions & 1,179 deletions console/pnpm-lock.yaml

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions daemon/Configuration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ public class DaemonConfig
/// Listen port the console client connects to
/// </summary>
public int ListenPort = 8801;
/// <summary>
/// List of allowed networks which can connect to the daemon. Defaults to all (0.0.0.0/0)
/// </summary>
public List<IPNetwork> AllowedNetworks = new List<IPNetwork> { IPNetwork.Parse("0.0.0.0/0") };
}

/// <summary>
Expand Down
1 change: 1 addition & 0 deletions daemon/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ static async Task Startup(FileInfo configFile, bool debug, bool verbose, bool no
Config.Control.RxOnly,
Config.Daemon.ListenAddress,
Config.Daemon.ListenPort,
Config.Daemon.AllowedNetworks,
Config.Control.Sb9600,
localAudio.TxAudioCallback,
16000,
Expand Down
4 changes: 2 additions & 2 deletions daemon/Radio.MotoSB9600.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@ public class MotoSb9600Radio : rc2_core.Radio
/// <param name="txAudioSampleRate">samplerate for tx audio</param>
public MotoSb9600Radio(
string name, string desc, bool rxOnly,
IPAddress listenAddress, int listenPort,
IPAddress listenAddress, int listenPort, List<IPNetwork> allowedNetworks,
MotoSb9600Config sb9600Config,
Action<short[]> txAudioCallback, int txAudioSampleRate, Action<AudioFormat> rtcFormatCallback,
List<SoftkeyName> softkeys,
List<TextLookup> zoneLookups = null, List<TextLookup> chanLookups = null
) : base(name, desc, rxOnly, listenAddress, listenPort, softkeys, zoneLookups, chanLookups, txAudioCallback, txAudioSampleRate, rtcFormatCallback)
) : base(name, desc, rxOnly, listenAddress, listenPort, allowedNetworks, softkeys, zoneLookups, chanLookups, txAudioCallback, txAudioSampleRate, rtcFormatCallback)
{
// Save softkey lookups
softkeyBindings = sb9600Config.SoftkeyBindings;
Expand Down
2 changes: 1 addition & 1 deletion daemon/SDL
Submodule SDL updated 48 files
+2 −0 .github/PULL_REQUEST_TEMPLATE.md
+0 −1 .github/workflows/generic.yml
+20 −0 AGENTS.md
+22 −0 CLAUDE.md
+3 −2 CMakeLists.txt
+1 −1 Makefile.os2
+1 −1 Makefile.w32
+1 −0 VisualC-GDK/SDL/SDL.vcxproj
+3 −0 VisualC-GDK/SDL/SDL.vcxproj.filters
+1 −0 VisualC/SDL/SDL.vcxproj
+3 −0 VisualC/SDL/SDL.vcxproj.filters
+20 −0 Xcode/SDL/SDL.xcodeproj/project.pbxproj
+26 −27 acinclude/libtool.m4
+1 −1 android-project/app/src/main/AndroidManifest.xml
+10 −2 android-project/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
+9 −11 android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
+32 −32 configure
+18 −4 include/SDL_atomic.h
+3 −5 include/SDL_cpuinfo.h
+13 −0 include/SDL_hints.h
+21 −0 src/SDL_utils.c
+3 −0 src/SDL_utils_c.h
+53 −15 src/atomic/SDL_atomic.c
+4 −11 src/atomic/SDL_spinlock.c
+2 −1 src/audio/directsound/SDL_directsound.c
+4 −0 src/core/windows/SDL_windows.c
+0 −3 src/dynapi/SDL_dynapi.c
+15 −0 src/joystick/SDL_gamecontroller.c
+3 −0 src/joystick/SDL_joystick.c
+708 −0 src/joystick/hidapi/SDL_hidapi_8bitdo.c
+3 −0 src/joystick/hidapi/SDL_hidapijoystick.c
+2 −0 src/joystick/hidapi/SDL_hidapijoystick_c.h
+7 −1 src/joystick/iphoneos/SDL_mfijoystick.m
+31 −6 src/joystick/linux/SDL_sysjoystick.c
+63 −0 src/joystick/ps2/SDL_sysjoystick.c
+8 −0 src/joystick/usb_ids.h
+1 −1 src/render/psp/SDL_render_psp.c
+1 −1 src/render/vitagxm/SDL_render_vita_gxm.c
+7 −2 src/video/SDL_surface.c
+1 −1 src/video/SDL_video.c
+10 −12 src/video/cocoa/SDL_cocoawindow.m
+4 −7 src/video/directfb/SDL_DirectFB_render.c
+11 −11 src/video/kmsdrm/SDL_kmsdrmvideo.c
+3 −1 src/video/os2/SDL_os2dive.c
+1 −1 src/video/wayland/SDL_waylandwindow.c
+26 −0 src/video/windows/SDL_windowsevents.c
+1 −1 test/CMakeLists.txt
+1 −0 test/configure
7 changes: 6 additions & 1 deletion daemon/daemon.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<PackageReference Include="Concentus" Version="2.2.2" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.2" />
<PackageReference Include="NAudio" Version="2.2.1" />
<PackageReference Include="newtonsoft.json" Version="13.0.4" />
<PackageReference Include="newtonsoft.json" Version="13.0.5-beta1" />
<PackageReference Include="Serilog" Version="4.3.1-dev-02406" />
<PackageReference Include="Serilog.Extensions.Logging" Version="10.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
Expand All @@ -28,6 +28,7 @@
<PackageReference Include="System.IO.Ports" Version="10.0.2" />
<PackageReference Include="Tomlyn" Version="0.20.0" />
<PackageReference Include="YamlDotNet" Version="16.3.0" />
<ProjectReference Include="rc2-core/rc2-core.csproj" />
</ItemGroup>

<ItemGroup>
Expand All @@ -36,4 +37,8 @@
</None>
</ItemGroup>

<ItemGroup>
<Compile Remove="rc2-core/**" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion daemon/rc2-core
Submodule rc2-core updated 4 files
+51 −7 RC2Server.cs
+2 −1 Radio.cs
+2 −2 WebRTC.Audio.cs
+194 −30 WebRTC.cs
Loading