Crash_Override/FreeDATA
1
0
Fork 0
mirror of https://github.com/DJ2LS/FreeDATA synced 2024-05-14 08:04:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into dependabot/npm_and_yarn/gui/electron-log-5.0.0

Browse source
This commit is contained in:
DJ2LS 2023-10-25 14:30:16 +02:00 committed by GitHub
commit d4cf192266
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gui/electron-builder.json5
View file

@ -13,11 +13,7 @@
"files": [ "files": [
"dist", "dist",
"dist-electron", "dist-electron",
], {
"extraResources": [
{
"from": "../modem/dist/modem/", "from": "../modem/dist/modem/",
"to": "modem", "to": "modem",
"filter": [ "filter": [
@ -25,22 +21,26 @@
"!**/.git" "!**/.git"
] ]
} }
], ],
"mac": { "mac": {
"target": [ "target": [
{ {
"target": "default", "target": "default",
"arch": ["arm64", "x64"] "arch": ["universal"]
} }
], ],
"notarize": "false", "notarize": "false",
"icon": "build/icon.png", "icon": "build/icon.png",
"hardenedRuntime": true, "hardenedRuntime": true,
"entitlements": "build/entitlements.plist", "entitlements": "build/entitlements.plist",
"entitlementsInherit": "build/entitlements.plist", "entitlementsInherit": "build/entitlements.plist",
"gatekeeperAssess": false, "gatekeeperAssess": false,
"mergeASARs": false,
"x64ArchFiles": "**/*",
"artifactName": "${productName}-Mac-${version}.${ext}" "artifactName": "${productName}-Mac-${version}.${ext}"
}, },
"win": { "win": {

4
gui/electron/main/index.ts
View file

@ -105,12 +105,12 @@ app.whenReady().then(() => {
switch (platform().toLowerCase()) { switch (platform().toLowerCase()) {
case "darwin": case "darwin":
case "linux": case "linux":
daemonPath = join(process.resourcesPath, "modem", "freedata-daemon"); daemonPath = join(__dirname, "modem", "freedata-daemon");
break; break;
case "win32": case "win32":
case "win64": case "win64":
daemonPath = join(process.resourcesPath, "modem", "freedata-daemon.exe"); daemonPath = join(__dirname, "modem", "freedata-daemon.exe");
break; break;
default: default:
console.log("Unhandled OS Platform: ", platform()); console.log("Unhandled OS Platform: ", platform());

3
gui/package.json
View file

@ -2,7 +2,7 @@
"name": "FreeDATA", "name": "FreeDATA",
"description": "FreeDATA", "description": "FreeDATA",
"private": true, "private": true,
"version": "0.11.0-alpha.7", "version": "0.11.0-alpha.9",
"main": "dist-electron/main/index.js", "main": "dist-electron/main/index.js",
"scripts": { "scripts": {
"start": "vite", "start": "vite",
@ -32,6 +32,7 @@
"homepage": "https://freedata.app", "homepage": "https://freedata.app",
"dependencies": { "dependencies": {
"@electron/notarize": "^2.1.0", "@electron/notarize": "^2.1.0",
"@electron/universal": "^1.4.2",
"@popperjs/core": "^2.11.8", "@popperjs/core": "^2.11.8",
"@vueuse/electron": "^10.4.1", "@vueuse/electron": "^10.4.1",
"blob-util": "^2.0.2", "blob-util": "^2.0.2",

2
gui/src/components/main_active_rig_control.vue
View file

@ -81,6 +81,8 @@ function set_hamlib_rf_level() {
<option value="14093000">20m | USB | EU, US</option> <option value="14093000">20m | USB | EU, US</option>
<option value="21093000">15m | USB | EU, US</option> <option value="21093000">15m | USB | EU, US</option>
<option value="24908000">12m | USB | EU, US</option> <option value="24908000">12m | USB | EU, US</option>
<option value="27245000">11m | USB | Ch 25</option>
<option value="27265000">11m | USB | Ch 26</option>
<option value="28093000">10m | USB | EU, US</option> <option value="28093000">10m | USB | EU, US</option>
<option value="50308000">6m | USB | US</option> <option value="50308000">6m | USB | US</option>
<option value="50616000">6m | USB | EU, US</option> <option value="50616000">6m | USB | EU, US</option>

2
modem/mesh.py
View file

@ -174,7 +174,7 @@ class MeshRouter():
except Exception as e: except Exception as e:
self.log.warning("[MESH] error adding data to routing table", e=e, router=new_router) self.log.warning("[MESH] error adding data to routing table", e=e, router=new_router)
def broadcast_routing_table(self, interval=10): def broadcast_routing_table(self, interval=600):
while True: while True:
# always enable receiving for datac4 if broadcasting # always enable receiving for datac4 if broadcasting

8
modem/sock.py
View file

@ -1407,8 +1407,12 @@ def send_modem_state():
} }
) )
#print(output) try:
return json.dumps(output) json_out = json.dumps(output)
except Exception as e:
log.warning("[SCK] error while json conversion for modem state", e=e)
return json_out
def command_response(command, status): def command_response(command, status):

2
modem/static.py
View file

@ -134,7 +134,7 @@ class TCIParam:
@dataclass @dataclass
class Modem: class Modem:
version = "0.11.0-alpha.7" version = "0.11.0-alpha.9"
host: str = "0.0.0.0" host: str = "0.0.0.0"
port: int = 3000 port: int = 3000
SOCKET_TIMEOUT: int = 1 # seconds SOCKET_TIMEOUT: int = 1 # seconds

2
tools/create_python_env.sh
View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
if [ ! -d "tnc" ]; then if [ ! -d "modem" ]; then
echo "Error: Run this script from the main FreeDATA directory." echo "Error: Run this script from the main FreeDATA directory."
exit 1 exit 1
fi fi