Skip to content

Commit

Permalink
cleanup some errors from Doxygen port;
Browse files Browse the repository at this point in the history
  • Loading branch information
gatekeep committed Jul 3, 2024
1 parent 4da05d2 commit 1a31a3d
Show file tree
Hide file tree
Showing 14 changed files with 38 additions and 25 deletions.
40 changes: 18 additions & 22 deletions FirmwareMain.cpp
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
// SPDX-License-Identifier: GPL-2.0-only
/**
* Digital Voice Modem - Modem Firmware
* GPLv2 Open Source. Use is subject to license terms.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* @package DVM / Modem Firmware
* @derivedfrom MMDVM (https://github.com/g4klx/MMDVM)
* @license GPLv2 License (https://opensource.org/licenses/GPL-2.0)
*
* Copyright (C) 2015,2016,2017,2018 Jonathan Naylor, G4KLX
* Copyright (C) 2016 Mathis Schmieder, DB9MAT
* Copyright (C) 2016 Colin Durbridge, G4EML
* Copyright (C) 2018 Bryan Biedenkapp, N2PLL
*
*/
/*
* Digital Voice Modem - Modem Firmware
* GPLv2 Open Source. Use is subject to license terms.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright (C) 2015,2016,2017,2018 Jonathan Naylor, G4KLX
* Copyright (C) 2016 Mathis Schmieder, DB9MAT
* Copyright (C) 2016 Colin Durbridge, G4EML
* Copyright (C) 2018 Bryan Biedenkapp, N2PLL
*
*/
#include "Globals.h"

// ---------------------------------------------------------------------------
Expand All @@ -34,33 +30,33 @@ bool m_duplex = true;
bool m_tx = false;
bool m_dcd = false;

/** DMR BS */
/* DMR BS */
dmr::DMRIdleRX dmrIdleRX;
dmr::DMRRX dmrRX;
dmr::DMRTX dmrTX;

/** DMR MS-DMO */
/* DMR MS-DMO */
dmr::DMRDMORX dmrDMORX;
dmr::DMRDMOTX dmrDMOTX;

/** P25 */
/* P25 */
p25::P25RX p25RX;
p25::P25TX p25TX;

/** NXDN */
/* NXDN */
nxdn::NXDNRX nxdnRX;
nxdn::NXDNTX nxdnTX;

/** Calibration */
/* Calibration */
dmr::CalDMR calDMR;
p25::CalP25 calP25;
nxdn::CalNXDN calNXDN;
CalRSSI calRSSI;

/** CW */
/* CW */
CWIdTX cwIdTX;

/** RS232 and Air Interface I/O */
/* RS232 and Air Interface I/O */
SerialPort serial;
IO io;

Expand Down
4 changes: 4 additions & 0 deletions STM_UART.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ class DSP_FW_API STM_UARTFIFO {

/**
* @brief
* @returns uint8_t
*/
uint8_t get()
{
Expand All @@ -57,6 +58,7 @@ class DSP_FW_API STM_UARTFIFO {

/**
* @brief
* @param data
*/
void put(uint8_t data)
{
Expand All @@ -74,6 +76,7 @@ class DSP_FW_API STM_UARTFIFO {

/**
* @brief
* @returns bool
*/
bool isEmpty()
{
Expand All @@ -82,6 +85,7 @@ class DSP_FW_API STM_UARTFIFO {

/**
* @brief
* @returns bool
*/
bool isFull()
{
Expand Down
2 changes: 1 addition & 1 deletion SerialPort.h
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ class DSP_FW_API SerialPort {
* @brief Writes data to the modem flash partition.
* @param[in] data Buffer containing data to write to flash partition.
* @param length Length of buffer.
* @returns uint8_t
* @returns uint8_t Reason code.
*/
uint8_t flashWrite(const uint8_t* data, uint8_t length);

Expand Down
6 changes: 5 additions & 1 deletion dmr/CalDMR.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ namespace dmr

/**
* @brief Calibration States
* @ingroup dmr_mfw
*/
enum DMR1KCAL {
DMRCAL1K_IDLE, //! Idle
Expand All @@ -40,9 +41,12 @@ namespace dmr

// ---------------------------------------------------------------------------
// Class Declaration
// Implements logic for DMR calibration mode.
// ---------------------------------------------------------------------------

/**
* @brief Implements logic for DMR calibration mode.
* @ingroup dmr_mfw
*/
class DSP_FW_API CalDMR {
public:
/**
Expand Down
1 change: 1 addition & 0 deletions dmr/DMRDMORX.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ namespace dmr

/**
* @brief DMR DMO Receiver State
* @ingroup dmr_mfw
*/
enum DMORX_STATE {
DMORXS_NONE, //! None
Expand Down
1 change: 1 addition & 0 deletions dmr/DMRSlotRX.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ namespace dmr

/**
* @brief DMR Slot Receiver State
* @ingroup dmr_mfw
*/
enum DMRRX_STATE {
DMRRXS_NONE, //! None
Expand Down
1 change: 1 addition & 0 deletions dmr/DMRTX.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ namespace dmr

/**
* @brief DMR Duplex Transmitter State
* @ingroup dmr_mfw
*/
enum DMRTXSTATE {
DMRTXSTATE_IDLE, //! Idle
Expand Down
2 changes: 1 addition & 1 deletion nxdn/CalNXDN.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ void CalNXDN::process()
}
}

/* Write P25 calibration data to the local buffer. */
/* Write NXDN calibration data to the local buffer. */

uint8_t CalNXDN::write(const uint8_t* data, uint16_t length)
{
Expand Down
1 change: 1 addition & 0 deletions nxdn/CalNXDN.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ namespace nxdn

/**
* @brief Calibration States
* @ingroup nxdn_mfw
*/
enum NXDNCAL1K {
NXDNCAL1K_IDLE, //! Idle
Expand Down
1 change: 1 addition & 0 deletions nxdn/NXDNRX.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ namespace nxdn

/**
* @brief NXDN Receiver State
* @ingroup nxdn_mfw
*/
enum NXDNRX_STATE {
NXDNRXS_NONE, //! None
Expand Down
1 change: 1 addition & 0 deletions nxdn/NXDNTX.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ namespace nxdn

/**
* @brief NXDN Transmitter States
* @ingroup nxdn_mfw
*/
enum NXDNTXSTATE {
NXDNTXSTATE_NORMAL, //! Normal
Expand Down
1 change: 1 addition & 0 deletions p25/CalP25.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ namespace p25

/**
* @brief Calibration States
* @ingroup p25_mfw
*/
enum P25CAL1K {
P25CAL1K_IDLE, //! Idle
Expand Down
1 change: 1 addition & 0 deletions p25/P25RX.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ namespace p25

/**
* @brief P25 Receiver State
* @ingroup p25_mfw
*/
enum P25RX_STATE {
P25RXS_NONE, //! None
Expand Down
1 change: 1 addition & 0 deletions p25/P25TX.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ namespace p25

/**
* @brief P25 Transmitter State
* @ingroup p25_mfw
*/
enum P25TXSTATE {
P25TXSTATE_NORMAL, //! Normal
Expand Down

0 comments on commit 1a31a3d

Please sign in to comment.