g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-04-06 06:53:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change all of the enums to the modern format.

Browse source
This commit is contained in:
Jonathan Naylor 2025-03-13 18:16:33 +00:00
parent 78fc96b0a5
commit 43f8b2f6f0
50 changed files with 1085 additions and 1064 deletions
Download patch file Download diff file Expand all files Collapse all files

26
POCSAGControl.cpp
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2018,2019,2020 Jonathan Naylor, G4KLX
* Copyright (C) 2018,2019,2020,2025 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
@ -68,7 +68,7 @@ m_output(),
m_buffer(),
m_ric(0U),
m_data(),
m_state(PS_NONE),
m_state(POCSAG_STATE::NONE),
m_enabled(true),
m_fp(NULL)
{
@ -289,7 +289,7 @@ bool CPOCSAGControl::processData()
void CPOCSAGControl::clock(unsigned int ms)
{
if (m_state == PS_NONE) {
if (m_state == POCSAG_STATE::NONE) {
bool ret = readNetwork();
if (!ret)
return;
@ -298,7 +298,7 @@ void CPOCSAGControl::clock(unsigned int ms)
if (!ret)
return;
m_state = PS_WAITING;
m_state = POCSAG_STATE::WAITING;
m_frames = 0U;
m_count = 1U;
@ -311,7 +311,7 @@ void CPOCSAGControl::clock(unsigned int ms)
m_output.push_back(POCSAG_SYNC_WORD);
for (unsigned int i = 0U; i < POCSAG_FRAME_ADDRESSES; i++) {
if (m_state == PS_WAITING) {
if (m_state == POCSAG_STATE::WAITING) {
if (i == (m_ric % POCSAG_FRAME_ADDRESSES)) {
uint32_t w1 = m_buffer.front();
m_buffer.pop_front();
@ -321,22 +321,22 @@ void CPOCSAGControl::clock(unsigned int ms)
m_output.push_back(w1);
m_output.push_back(w2);
m_state = PS_SENDING;
m_state = POCSAG_STATE::SENDING;
} else {
m_output.push_back(POCSAG_IDLE_WORD);
m_output.push_back(POCSAG_IDLE_WORD);
}
} else if (m_state == PS_SENDING) {
} else if (m_state == POCSAG_STATE::SENDING) {
if (m_buffer.empty()) {
m_output.push_back(POCSAG_IDLE_WORD);
m_output.push_back(POCSAG_IDLE_WORD);
bool ret = processData();
if (ret) {
m_state = PS_WAITING;
m_state = POCSAG_STATE::WAITING;
m_count++;
} else {
m_state = PS_ENDING;
m_state = POCSAG_STATE::ENDING;
}
} else {
uint32_t w1 = m_buffer.front();
@ -347,7 +347,7 @@ void CPOCSAGControl::clock(unsigned int ms)
m_output.push_back(w1);
m_output.push_back(w2);
}
} else { // PS_ENDING
} else { // ENDING
m_output.push_back(POCSAG_IDLE_WORD);
m_output.push_back(POCSAG_IDLE_WORD);
}
@ -356,10 +356,10 @@ void CPOCSAGControl::clock(unsigned int ms)
writeQueue();
m_frames++;
if (m_state == PS_ENDING) {
if (m_state == POCSAG_STATE::ENDING) {
LogMessage("POCSAG, transmitted %u frame(s) of data from %u message(s)", m_frames, m_count);
m_display->clearPOCSAG();
m_state = PS_NONE;
m_state = POCSAG_STATE::NONE;
#if defined(DUMP_POCSAG)
closeFile();
@ -568,7 +568,7 @@ void CPOCSAGControl::enable(bool enabled)
delete *it;
m_data.clear();
m_state = PS_NONE;
m_state = POCSAG_STATE::NONE;
}
m_enabled = enabled;