Browse Source

beacon send bug fix and copyrights

pull/25/head
Piotr Wilkon 2 years ago
parent
commit
00431f9716
22 changed files with 52 additions and 7 deletions
  1. +2
    -0
      Inc/ax25.h
  2. +2
    -0
      Inc/beacon.h
  3. +3
    -0
      Inc/common.h
  4. +2
    -0
      Inc/config.h
  5. +2
    -0
      Inc/digipeater.h
  6. +2
    -0
      Inc/drivers/modem.h
  7. +2
    -1
      Inc/drivers/systick.h
  8. +2
    -0
      Inc/drivers/uart.h
  9. +2
    -0
      Inc/drivers/watchdog.h
  10. +2
    -0
      Inc/main.h
  11. +2
    -0
      Inc/terminal.h
  12. +3
    -0
      Src/ax25.c
  13. +3
    -1
      Src/beacon.c
  14. +2
    -0
      Src/common.c
  15. +3
    -1
      Src/config.c
  16. +4
    -2
      Src/digipeater.c
  17. +2
    -0
      Src/drivers/modem.c
  18. +2
    -0
      Src/drivers/systick.c
  19. +2
    -0
      Src/drivers/uart.c
  20. +2
    -0
      Src/drivers/watchdog.c
  21. +2
    -0
      Src/main.c
  22. +4
    -2
      Src/terminal.c

+ 2
- 0
Inc/ax25.h View File

@ -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


+ 2
- 0
Inc/beacon.h View File

@ -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


+ 3
- 0
Inc/common.h View File

@ -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 <http://www.gnu.org/licenses/>.
*/
#ifndef COMMON_H_
#define COMMON_H_


+ 2
- 0
Inc/config.h View File

@ -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


+ 2
- 0
Inc/digipeater.h View File

@ -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


+ 2
- 0
Inc/drivers/modem.h View File

@ -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


+ 2
- 1
Inc/drivers/systick.h View File

@ -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 <http://www.gnu.org/licenses/>.
*/
#ifndef SYSTICK_H_
#define SYSTICK_H_


+ 2
- 0
Inc/drivers/uart.h View File

@ -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


+ 2
- 0
Inc/drivers/watchdog.h View File

@ -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


+ 2
- 0
Inc/main.h View File

@ -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


+ 2
- 0
Inc/terminal.h View File

@ -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


+ 3
- 0
Src/ax25.c View File

@ -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++;


+ 3
- 1
Src/beacon.c View File

@ -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);


+ 2
- 0
Src/common.c View File

@ -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


+ 3
- 1
Src/config.c View File

@ -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 <http://www.gnu.org/licenses/>.
along with VP-Digi. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"


+ 4
- 2
Src/digipeater.c View File

@ -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 <http://www.gnu.org/licenses/>.
along with VP-Digi. If not, see <http://www.gnu.org/licenses/>.
*/
#include "digipeater.h"


+ 2
- 0
Src/drivers/modem.c View File

@ -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


+ 2
- 0
Src/drivers/systick.c View File

@ -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


+ 2
- 0
Src/drivers/uart.c View File

@ -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


+ 2
- 0
Src/drivers/watchdog.c View File

@ -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


+ 2
- 0
Src/main.c View File

@ -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


+ 4
- 2
Src/terminal.c View File

@ -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 <http://www.gnu.org/licenses/>.
along with VP-Digi. If not, see <http://www.gnu.org/licenses/>.
*/
#include "terminal.h"


Loading…
Cancel
Save