From 00431f97161407419f5da43be73f73819b32d2ea Mon Sep 17 00:00:00 2001 From: Piotr Wilkon Date: Tue, 29 Aug 2023 10:16:34 +0200 Subject: [PATCH] beacon send bug fix and copyrights --- Inc/ax25.h | 2 ++ Inc/beacon.h | 2 ++ Inc/common.h | 3 +++ Inc/config.h | 2 ++ Inc/digipeater.h | 2 ++ Inc/drivers/modem.h | 2 ++ Inc/drivers/systick.h | 3 ++- Inc/drivers/uart.h | 2 ++ Inc/drivers/watchdog.h | 2 ++ Inc/main.h | 2 ++ Inc/terminal.h | 2 ++ Src/ax25.c | 3 +++ Src/beacon.c | 4 +++- Src/common.c | 2 ++ Src/config.c | 4 +++- Src/digipeater.c | 6 ++++-- Src/drivers/modem.c | 2 ++ Src/drivers/systick.c | 2 ++ Src/drivers/uart.c | 2 ++ Src/drivers/watchdog.c | 2 ++ Src/main.c | 2 ++ Src/terminal.c | 6 ++++-- 22 files changed, 52 insertions(+), 7 deletions(-) diff --git a/Inc/ax25.h b/Inc/ax25.h index fb26893..1c524db 100644 --- a/Inc/ax25.h +++ b/Inc/ax25.h @@ -1,4 +1,6 @@ /* +Copyright 2020-2023 Piotr Wilkon + This file is part of VP-Digi. VP-Digi is free software: you can redistribute it and/or modify diff --git a/Inc/beacon.h b/Inc/beacon.h index 57b019f..9608e8e 100644 --- a/Inc/beacon.h +++ b/Inc/beacon.h @@ -1,4 +1,6 @@ /* +Copyright 2020-2023 Piotr Wilkon + This file is part of VP-Digi. VP-Digi is free software: you can redistribute it and/or modify diff --git a/Inc/common.h b/Inc/common.h index fb2262c..1b01005 100644 --- a/Inc/common.h +++ b/Inc/common.h @@ -1,4 +1,6 @@ /* +Copyright 2020-2023 Piotr Wilkon + This file is part of VP-Digi. VP-Digi is free software: you can redistribute it and/or modify @@ -14,6 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with VP-Digi. If not, see . */ + #ifndef COMMON_H_ #define COMMON_H_ diff --git a/Inc/config.h b/Inc/config.h index 1dcb11c..9a5425a 100644 --- a/Inc/config.h +++ b/Inc/config.h @@ -1,4 +1,6 @@ /* +Copyright 2020-2023 Piotr Wilkon + This file is part of VP-Digi. VP-Digi is free software: you can redistribute it and/or modify diff --git a/Inc/digipeater.h b/Inc/digipeater.h index d75da18..e127673 100644 --- a/Inc/digipeater.h +++ b/Inc/digipeater.h @@ -1,4 +1,6 @@ /* +Copyright 2020-2023 Piotr Wilkon + This file is part of VP-Digi. VP-Digi is free software: you can redistribute it and/or modify diff --git a/Inc/drivers/modem.h b/Inc/drivers/modem.h index 19bb73a..d6b4cf7 100644 --- a/Inc/drivers/modem.h +++ b/Inc/drivers/modem.h @@ -1,4 +1,6 @@ /* +Copyright 2020-2023 Piotr Wilkon + This file is part of VP-Digi. VP-Digi is free software: you can redistribute it and/or modify diff --git a/Inc/drivers/systick.h b/Inc/drivers/systick.h index 5367e6e..175264e 100644 --- a/Inc/drivers/systick.h +++ b/Inc/drivers/systick.h @@ -1,4 +1,6 @@ /* +Copyright 2020-2023 Piotr Wilkon + This file is part of VP-Digi. VP-Digi is free software: you can redistribute it and/or modify @@ -14,7 +16,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with VP-Digi. If not, see . */ - #ifndef SYSTICK_H_ #define SYSTICK_H_ diff --git a/Inc/drivers/uart.h b/Inc/drivers/uart.h index e8153eb..588b373 100644 --- a/Inc/drivers/uart.h +++ b/Inc/drivers/uart.h @@ -1,4 +1,6 @@ /* +Copyright 2020-2023 Piotr Wilkon + This file is part of VP-Digi. VP-Digi is free software: you can redistribute it and/or modify diff --git a/Inc/drivers/watchdog.h b/Inc/drivers/watchdog.h index fb4be59..29fd911 100644 --- a/Inc/drivers/watchdog.h +++ b/Inc/drivers/watchdog.h @@ -1,4 +1,6 @@ /* +Copyright 2020-2023 Piotr Wilkon + This file is part of VP-Digi. VP-Digi is free software: you can redistribute it and/or modify diff --git a/Inc/main.h b/Inc/main.h index 2b36bf2..b6a45b6 100644 --- a/Inc/main.h +++ b/Inc/main.h @@ -19,6 +19,8 @@ */ /* +Copyright 2020-2023 Piotr Wilkon + This file is part of VP-Digi. VP-Digi is free software: you can redistribute it and/or modify diff --git a/Inc/terminal.h b/Inc/terminal.h index 001e36a..4392d2b 100644 --- a/Inc/terminal.h +++ b/Inc/terminal.h @@ -1,4 +1,6 @@ /* +Copyright 2020-2023 Piotr Wilkon + This file is part of VP-Digi. VP-Digi is free software: you can redistribute it and/or modify diff --git a/Src/ax25.c b/Src/ax25.c index 4dd5e10..3dbce4e 100644 --- a/Src/ax25.c +++ b/Src/ax25.c @@ -1,4 +1,6 @@ /* +Copyright 2020-2023 Piotr Wilkon + This file is part of VP-Digi. VP-Digi is free software: you can redistribute it and/or modify @@ -440,6 +442,7 @@ transmitNormalData: else { txFlagsElapsed = 0; + txByteIdx = 0; txStage = TX_STAGE_DATA; //return to normal data transmission stage. There might be a next frame to transmit txFrameBufferFull = false; txFrameTail++; diff --git a/Src/beacon.c b/Src/beacon.c index 9462b0c..98d89ec 100644 --- a/Src/beacon.c +++ b/Src/beacon.c @@ -1,4 +1,6 @@ /* +Copyright 2020-2023 Piotr Wilkon + This file is part of VP-Digi. VP-Digi is free software: you can redistribute it and/or modify @@ -105,7 +107,7 @@ void BeaconCheck(void) if((beacon[i].interval > 0) && ((SysTickGet() >= beacon[i].next) || (beacon[i].next == 0))) { if(beaconDelay[i] > SysTickGet()) //check for beacon delay (only for the very first transmission) - return; + continue; beacon[i].next = SysTickGet() + beacon[i].interval; //save next beacon timestamp beaconDelay[i] = 0; BeaconSend(i); diff --git a/Src/common.c b/Src/common.c index c7d075b..0b1be09 100644 --- a/Src/common.c +++ b/Src/common.c @@ -1,4 +1,6 @@ /* +Copyright 2020-2023 Piotr Wilkon + This file is part of VP-Digi. VP-Digi is free software: you can redistribute it and/or modify diff --git a/Src/config.c b/Src/config.c index 1839b18..893aeb9 100644 --- a/Src/config.c +++ b/Src/config.c @@ -1,4 +1,6 @@ /* +Copyright 2020-2023 Piotr Wilkon + This file is part of VP-Digi. VP-Digi is free software: you can redistribute it and/or modify @@ -12,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with VP-DigiConfig. If not, see . +along with VP-Digi. If not, see . */ #include "config.h" diff --git a/Src/digipeater.c b/Src/digipeater.c index 78c925c..8cbce4b 100644 --- a/Src/digipeater.c +++ b/Src/digipeater.c @@ -1,5 +1,7 @@ /* -This file is part of VP-DigiConfig. +Copyright 2020-2023 Piotr Wilkon + +This file is part of VP-Digi. VP-Digi is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with VP-DigiConfig. If not, see . +along with VP-Digi. If not, see . */ #include "digipeater.h" diff --git a/Src/drivers/modem.c b/Src/drivers/modem.c index ba419af..c27fa6b 100644 --- a/Src/drivers/modem.c +++ b/Src/drivers/modem.c @@ -1,4 +1,6 @@ /* +Copyright 2020-2023 Piotr Wilkon + This file is part of VP-Digi. VP-Digi is free software: you can redistribute it and/or modify diff --git a/Src/drivers/systick.c b/Src/drivers/systick.c index 64f1b55..7e18dd0 100644 --- a/Src/drivers/systick.c +++ b/Src/drivers/systick.c @@ -1,4 +1,6 @@ /* +Copyright 2020-2023 Piotr Wilkon + This file is part of VP-Digi. VP-Digi is free software: you can redistribute it and/or modify diff --git a/Src/drivers/uart.c b/Src/drivers/uart.c index 968f29e..544bcdb 100644 --- a/Src/drivers/uart.c +++ b/Src/drivers/uart.c @@ -1,4 +1,6 @@ /* +Copyright 2020-2023 Piotr Wilkon + This file is part of VP-Digi. VP-Digi is free software: you can redistribute it and/or modify diff --git a/Src/drivers/watchdog.c b/Src/drivers/watchdog.c index 52e2f14..935eb47 100644 --- a/Src/drivers/watchdog.c +++ b/Src/drivers/watchdog.c @@ -1,4 +1,6 @@ /* +Copyright 2020-2023 Piotr Wilkon + This file is part of VP-Digi. VP-Digi is free software: you can redistribute it and/or modify diff --git a/Src/main.c b/Src/main.c index 53c891c..0ae2db8 100644 --- a/Src/main.c +++ b/Src/main.c @@ -17,6 +17,8 @@ ****************************************************************************** */ /* +Copyright 2020-2023 Piotr Wilkon + This file is part of VP-Digi. VP-Digi is free software: you can redistribute it and/or modify diff --git a/Src/terminal.c b/Src/terminal.c index 5a99b73..f4ef73f 100644 --- a/Src/terminal.c +++ b/Src/terminal.c @@ -1,5 +1,7 @@ /* -This file is part of VP-DigiConfig. +Copyright 2020-2023 Piotr Wilkon + +This file is part of VP-Digi. VP-Digi is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with VP-DigiConfig. If not, see . +along with VP-Digi. If not, see . */ #include "terminal.h"