mirror of
https://github.com/g4klx/MMDVMHost.git
synced 2026-03-10 23:33:56 +01:00
Rename MMDVM.ini to MMDVMHost.ini
This commit is contained in:
parent
ed6c28c0c1
commit
81e16b87f4
|
|
@ -1,7 +1,7 @@
|
|||
# DMRplus - Startup Options
|
||||
|
||||
## Introduction
|
||||
This file is to give an overview over the Options-parameter in MMDVM.ini [DMR Network]-section.
|
||||
This file is to give an overview over the Options-parameter in MMDVMHost.ini [DMR Network]-section.
|
||||
|
||||
## Example
|
||||
You can pull some conection-info at startup to the DMRplus-Network to define the behavior of TS1 and TS2 in DMR-mode.
|
||||
|
|
|
|||
|
|
@ -17,5 +17,5 @@ RUN make \
|
|||
VOLUME /MMDVMHost
|
||||
WORKDIR /MMDVMHost
|
||||
|
||||
CMD ["MMDVMHost", "/MMDVMHost/MMDVM.ini"]
|
||||
CMD ["MMDVMHost", "/MMDVMHost/MMDVMHost.ini"]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 2015-2021,2023,2024,2025 by Jonathan Naylor G4KLX
|
||||
* Copyright (C) 2015-2021,2023,2024,2025,2026 by Jonathan Naylor G4KLX
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -51,9 +51,9 @@
|
|||
#endif
|
||||
|
||||
#if defined(_WIN32) || defined(_WIN64)
|
||||
const char* DEFAULT_INI_FILE = "MMDVM.ini";
|
||||
const char* DEFAULT_INI_FILE = "MMDVMHost.ini";
|
||||
#else
|
||||
const char* DEFAULT_INI_FILE = "/etc/MMDVM.ini";
|
||||
const char* DEFAULT_INI_FILE = "/etc/MMDVMHost.ini";
|
||||
#endif
|
||||
|
||||
static bool m_killed = false;
|
||||
|
|
|
|||
|
|
@ -51,10 +51,10 @@ Time=24
|
|||
# Valid values are "null", "uart", "udp", and (on Linux) "i2c"
|
||||
Protocol=null
|
||||
# The port and speed used for a UART connection
|
||||
# UARTPort=\\.\COM4
|
||||
UARTPort=\\.\COM11
|
||||
# UARTPort=/dev/ttyACM0
|
||||
UARTPort=/dev/ttyAMA0
|
||||
UARTSpeed=460800
|
||||
# UARTPort=/dev/ttyAMA0
|
||||
UARTSpeed=115200
|
||||
# The port and address for an I2C connection
|
||||
I2CPort=/dev/i2c
|
||||
I2CAddress=0x22
|
||||
|
|
@ -97,7 +97,7 @@ LocalPort=40095
|
|||
# SendFrameType=0
|
||||
|
||||
[D-Star]
|
||||
Enable=1
|
||||
Enable=0
|
||||
Module=C
|
||||
SelfOnly=0
|
||||
AckReply=1
|
||||
|
|
@ -127,7 +127,7 @@ TXHang=4
|
|||
# OVCM=0
|
||||
|
||||
[System Fusion]
|
||||
Enable=1
|
||||
Enable=0
|
||||
LowDeviation=0
|
||||
SelfOnly=0
|
||||
TXHang=4
|
||||
|
|
@ -135,7 +135,7 @@ RemoteGateway=0
|
|||
# ModeHang=10
|
||||
|
||||
[P25]
|
||||
Enable=1
|
||||
Enable=0
|
||||
NAC=293
|
||||
SelfOnly=0
|
||||
OverrideUIDCheck=0
|
||||
|
|
@ -144,7 +144,7 @@ TXHang=5
|
|||
# ModeHang=10
|
||||
|
||||
[NXDN]
|
||||
Enable=1
|
||||
Enable=0
|
||||
RAN=1
|
||||
SelfOnly=0
|
||||
RemoteGateway=0
|
||||
12
Makefile
12
Makefile
|
|
@ -29,7 +29,7 @@ install: all
|
|||
install -m 755 MMDVMHost /usr/local/bin/
|
||||
|
||||
.PHONY install-service:
|
||||
install-service: install /etc/MMDVM.ini
|
||||
install-service: install /etc/MMDVMHost.ini
|
||||
@useradd --user-group -M --system mmdvm --shell /bin/false || true
|
||||
@usermod --groups dialout --append mmdvm || true
|
||||
@mkdir /var/log/mmdvm || true
|
||||
|
|
@ -37,11 +37,11 @@ install-service: install /etc/MMDVM.ini
|
|||
@cp ./linux/systemd/mmdvmhost.service /lib/systemd/system/
|
||||
@systemctl enable mmdvmhost.service
|
||||
|
||||
/etc/MMDVM.ini:
|
||||
@cp -n MMDVM.ini /etc/MMDVM.ini
|
||||
@sed -i 's/FilePath=./FilePath=\/var\/log\/mmdvm\//' /etc/MMDVM.ini
|
||||
@sed -i 's/Daemon=0/Daemon=1/' /etc/MMDVM.ini
|
||||
@chown mmdvm:mmdvm /etc/MMDVM.ini
|
||||
/etc/MMDVMHost.ini:
|
||||
@cp -n MMDVMHost.ini /etc/MMDVMHost.ini
|
||||
@sed -i 's/FilePath=./FilePath=\/var\/log\/mmdvm\//' /etc/MMDVMHost.ini
|
||||
@sed -i 's/Daemon=0/Daemon=1/' /etc/MMDVMHost.ini
|
||||
@chown mmdvm:mmdvm /etc/MMDVMHost.ini
|
||||
|
||||
.PHONY uninstall-service:
|
||||
uninstall-service:
|
||||
|
|
|
|||
|
|
@ -19,6 +19,6 @@
|
|||
#if !defined(VERSION_H)
|
||||
#define VERSION_H
|
||||
|
||||
const char* VERSION = "20260227";
|
||||
const char* VERSION = "20260310";
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ DMRFILEBACKUP=1
|
|||
#
|
||||
# Command line to restart MMDVMHost
|
||||
RESTARTCOMMAND="systemctl restart mmdvmhost.service"
|
||||
# RESTARTCOMMAND="killall MMDVMHost ; /path/to/MMDVMHost/executable/MMDVMHost /path/to/MMDVM/ini/file/MMDVM.ini"
|
||||
# RESTARTCOMMAND="killall MMDVMHost ; /path/to/MMDVMHost/executable/MMDVMHost /path/to/MMDVM/ini/file/MMDVMHost.ini"
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ DMRFILEBACKUP=1
|
|||
#
|
||||
# Command line to restart MMDVMHost
|
||||
RESTARTCOMMAND="systemctl restart mmdvmhost.service"
|
||||
# RESTARTCOMMAND="killall MMDVMHost ; /path/to/MMDVMHost/executable/MMDVMHost /path/to/MMDVM/ini/file/MMDVM.ini"
|
||||
# RESTARTCOMMAND="killall MMDVMHost ; /path/to/MMDVMHost/executable/MMDVMHost /path/to/MMDVM/ini/file/MMDVMHost.ini"
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
version: '3'
|
||||
services:
|
||||
mmdvmhost:
|
||||
build: https://github.com/g4klx/MMDVMHost.git # Make your image Docker
|
||||
# image: f4hlv/mmdvmhost # Download MMDVMHost image on Dockerhub
|
||||
build: https://github.com/g4klx/MMDVMHost.git # Make your image Docker
|
||||
# image: f4hlv/mmdvmhost # Download MMDVMHost image on Dockerhub
|
||||
container_name: mmdvmhost
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- ./MMDVM.ini:/MMDVMHost/MMDVM.ini:ro # Path to the MMDVM.ini File
|
||||
- ./RSSI.dat:/MMDVMHost/RSSI.dat:ro # Path to the RSSI.dat File (Optional)
|
||||
- ./DMRIds.dat:/MMDVMHost/DMRIds.dat:ro # Path to the DMRIds.dat File (Optional)
|
||||
- ./MMDVMHost.ini:/MMDVMHost/MMDVMHost.ini:ro # Path to the MMDVM.ini File
|
||||
- ./RSSI.dat:/MMDVMHost/RSSI.dat:ro # Path to the RSSI.dat File (Optional)
|
||||
- ./DMRIds.dat:/MMDVMHost/DMRIds.dat:ro # Path to the DMRIds.dat File (Optional)
|
||||
- mmdvmhost:/MMDVMHost
|
||||
devices:
|
||||
- /dev/ttyACM0:/dev/ttyACM0 # Specify the mmdvm "/dev/tty***" interface
|
||||
- /dev/ttyACM0:/dev/ttyACM0 # Specify the mmdvm "/dev/tty***" interface
|
||||
volumes:
|
||||
mmdvmhost:
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
### CONFIG VARIABLES ###
|
||||
|
||||
sysopCallsign=XX0XXX
|
||||
iniFile=/path/to/MMDVM.ini
|
||||
iniFile=/path/to/MMDVMHost.ini
|
||||
shutdownTG=999999
|
||||
rebootTG=888888
|
||||
allowShutdown=1
|
||||
|
|
|
|||
Loading…
Reference in a new issue