From ba0002222b69d2921fc9f725255cc6fe720c88de Mon Sep 17 00:00:00 2001 From: sq8vps Date: Wed, 30 Aug 2023 22:57:27 +0200 Subject: [PATCH] non-aprs config bug, pwm by default --- CHANGELOG.md | 9 +++++++++ Src/common.c | 2 +- Src/config.c | 8 ++++---- Src/main.c | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a16a44..e0df1dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# 1.3.1 (2023-08-30) +## New features +* none +## Bug fixes +* Non-APRS switch was not stored in memory +## Other +* PWM is now the default option +## Known bugs +* none # 1.3.0 (2023-08-30) ## New features * Callsign is now set together with SSID using ```call ``` diff --git a/Src/common.c b/Src/common.c index 0b1be09..b7b3aa4 100644 --- a/Src/common.c +++ b/Src/common.c @@ -32,7 +32,7 @@ struct _GeneralConfig GeneralConfig = .kissMonitor = 0, }; -const char versionString[] = "VP-Digi v. 1.3.0\r\nThe open-source standalone APRS digipeater controller and KISS TNC\r\n"; +const char versionString[] = "VP-Digi v. 1.3.1\r\nThe open-source standalone APRS digipeater controller and KISS TNC\r\n"; static uint64_t pow10i(uint16_t exp) { diff --git a/Src/config.c b/Src/config.c index 893aeb9..5547975 100644 --- a/Src/config.c +++ b/Src/config.c @@ -199,9 +199,9 @@ void ConfigWrite(void) { ConfigErase(); - writeString(CONFIG_CALL, GeneralConfig.call, sizeof(GeneralConfig.call)); + writeString(CONFIG_CALL, GeneralConfig.call, 6); write(CONFIG_SSID, GeneralConfig.callSsid); - writeString(CONFIG_DEST, GeneralConfig.dest, sizeof(GeneralConfig.dest)); + writeString(CONFIG_DEST, GeneralConfig.dest, 6); write(CONFIG_TXDELAY, Ax25Config.txDelayLength); write(CONFIG_TXTAIL, Ax25Config.txTailLength); write(CONFIG_TXQUIET, Ax25Config.quietTime); @@ -281,10 +281,10 @@ uint8_t ConfigRead(void) readString(CONFIG_CALL, GeneralConfig.call, sizeof(GeneralConfig.call)); GeneralConfig.callSsid = (uint8_t)read(CONFIG_SSID); uint8_t temp[6]; - readString(CONFIG_DEST, temp, sizeof(temp)); + readString(CONFIG_DEST, temp, 6); if((temp[0] >= ('A' << 1)) && (temp[0] <= ('Z' << 1)) && ((temp[0] & 1) == 0)) //check if stored destination address is correct (we just assume it by reading the first byte) { - memcpy(GeneralConfig.dest, temp, sizeof(temp)); + memcpy(GeneralConfig.dest, temp, 6); } Ax25Config.txDelayLength = read(CONFIG_TXDELAY); Ax25Config.txTailLength = read(CONFIG_TXTAIL); diff --git a/Src/main.c b/Src/main.c index 0ae2db8..156dd64 100644 --- a/Src/main.c +++ b/Src/main.c @@ -226,7 +226,7 @@ int main(void) //set some initial values in case there is no configuration saved in memory Uart1.baudrate = 9600; Uart2.baudrate = 9600; - ModemConfig.usePWM = 0; + ModemConfig.usePWM = 1; //use PWM by default ModemConfig.flatAudioIn = 0; Ax25Config.quietTime = 300; Ax25Config.txDelayLength = 300;