24315872327

Committed 12 Apr 2026 08:37PM UTC coverage: 25.594% (-0.002%) from 25.596%

Build # 24315872327

Build Type

push

github

Committed by

reinder

Commit Message

[cbus] added setting for short event node number, default is zero

Coverage Stats

0 of 6 new or added lines in 2 files covered. (0.0%)

1 existing line in 1 file now uncovered.

8300 of 32430 relevant lines covered (25.59%)

178.27 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/server/src/hardware/interface/cbus/cbussettings.cpp

/**
 * This file is part of Traintastic,
 * see <https://github.com/traintastic/traintastic>.
 *
 * Copyright (C) 2026 Reinder Feenstra
 *
 * 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 the Free Software Foundation; either version 2
 * of the License, or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * 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 this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */

#include "cbussettings.hpp"
#include "../../protocol/cbus/cbusconst.hpp"
#include "../../../core/attributes.hpp"
#include "../../../utils/displayname.hpp"
#include "../../../utils/unit.hpp"

CBUSSettings::CBUSSettings(Object& _parent, std::string_view parentPropertyName)
  : SubObject(_parent, parentPropertyName)
  , engineKeepAlive{this, "engine_keep_alive", engineKeepAliveDefault, PropertyFlags::ReadWrite | PropertyFlags::Store}
  , dccAccessorySwitchTime{this, "dcc_accessory_switch_time", dccAccessorySwitchTimeDefault, PropertyFlags::ReadWrite | PropertyFlags::Store}
  , shortEventNodeNumber{this, "short_event_node_number", 0, PropertyFlags::ReadWrite | PropertyFlags::Store}
  , hubEnabled{this, "hub_enabled", false, PropertyFlags::ReadWrite | PropertyFlags::Store}
  , hubLocalhostOnly{this, "hub_localhost_only", true, PropertyFlags::ReadWrite | PropertyFlags::Store}
  , hubPort{this, "hub_port", CBUS::defaultTCPPort, PropertyFlags::ReadWrite | PropertyFlags::Store}
  , debugLogRXTX{this, "debug_log_rx_tx", false, PropertyFlags::ReadWrite | PropertyFlags::Store}
{
  Attributes::addMinMax(engineKeepAlive, engineKeepAliveMin, engineKeepAliveMax);
  Attributes::addUnit(engineKeepAlive, Unit::seconds);
  m_interfaceItems.add(engineKeepAlive);

  Attributes::addMinMax(dccAccessorySwitchTime, dccAccessorySwitchTimeMin, dccAccessorySwitchTimeMax);
  Attributes::addStep(dccAccessorySwitchTime, dccAccessorySwitchTimeStep);
  Attributes::addUnit(dccAccessorySwitchTime, Unit::milliSeconds);
  m_interfaceItems.add(dccAccessorySwitchTime);

  m_interfaceItems.add(shortEventNodeNumber);

  m_interfaceItems.add(hubEnabled);

  m_interfaceItems.add(hubLocalhostOnly);

  m_interfaceItems.add(hubPort);

  Attributes::addDisplayName(debugLogRXTX, DisplayName::Hardware::debugLogRXTX);
  //Attributes::addGroup(debugLogRXTX, Group::debug);
  m_interfaceItems.add(debugLogRXTX);
}

CBUS::Config CBUSSettings::config() const
{
  return CBUS::Config{
    .engineKeepAlive = std::chrono::seconds(engineKeepAlive),
    .dccAccessorySwitchTime = std::chrono::milliseconds(dccAccessorySwitchTime),
    .shortEventNodeNumber = shortEventNodeNumber,
    .hubEnabled = hubEnabled,
    .hubLocalhostOnly = hubLocalhostOnly,
    .hubPort = hubPort,
    .debugLogRXTX = debugLogRXTX,
  };
}

1	/**
2	* This file is part of Traintastic,
3	* see <https://github.com/traintastic/traintastic>.
4	*
5	* Copyright (C) 2026 Reinder Feenstra
6	*
7	* This program is free software; you can redistribute it and/or
8	* modify it under the terms of the GNU General Public License
9	* as published by the Free Software Foundation; either version 2
10	* of the License, or (at your option) any later version.
11	*
12	* This program is distributed in the hope that it will be useful,
13	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	* GNU General Public License for more details.
16	*
17	* You should have received a copy of the GNU General Public License
18	* along with this program; if not, write to the Free Software
19	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20	*/
21
22	#include "cbussettings.hpp"
23	#include "../../protocol/cbus/cbusconst.hpp"
24	#include "../../../core/attributes.hpp"
25	#include "../../../utils/displayname.hpp"
26	#include "../../../utils/unit.hpp"
27
28	CBUSSettings::CBUSSettings(Object& _parent, std::string_view parentPropertyName)	×
29	: SubObject(_parent, parentPropertyName)
30	, engineKeepAlive{this, "engine_keep_alive", engineKeepAliveDefault, PropertyFlags::ReadWrite \| PropertyFlags::Store}	×
31	, dccAccessorySwitchTime{this, "dcc_accessory_switch_time", dccAccessorySwitchTimeDefault, PropertyFlags::ReadWrite \| PropertyFlags::Store}	×
NEW 32	, shortEventNodeNumber{this, "short_event_node_number", 0, PropertyFlags::ReadWrite \| PropertyFlags::Store}	×
33	, hubEnabled{this, "hub_enabled", false, PropertyFlags::ReadWrite \| PropertyFlags::Store}	×
34	, hubLocalhostOnly{this, "hub_localhost_only", true, PropertyFlags::ReadWrite \| PropertyFlags::Store}	×
35	, hubPort{this, "hub_port", CBUS::defaultTCPPort, PropertyFlags::ReadWrite \| PropertyFlags::Store}	×
36	, debugLogRXTX{this, "debug_log_rx_tx", false, PropertyFlags::ReadWrite \| PropertyFlags::Store}	×
37	{
38	Attributes::addMinMax(engineKeepAlive, engineKeepAliveMin, engineKeepAliveMax);	×
39	Attributes::addUnit(engineKeepAlive, Unit::seconds);	×
40	m_interfaceItems.add(engineKeepAlive);	×
41
42	Attributes::addMinMax(dccAccessorySwitchTime, dccAccessorySwitchTimeMin, dccAccessorySwitchTimeMax);	×
43	Attributes::addStep(dccAccessorySwitchTime, dccAccessorySwitchTimeStep);	×
44	Attributes::addUnit(dccAccessorySwitchTime, Unit::milliSeconds);	×
45	m_interfaceItems.add(dccAccessorySwitchTime);	×
46
NEW 47	m_interfaceItems.add(shortEventNodeNumber);	×
48
UNCOV 49	m_interfaceItems.add(hubEnabled);	×
50
51	m_interfaceItems.add(hubLocalhostOnly);	×
52
53	m_interfaceItems.add(hubPort);	×
54
55	Attributes::addDisplayName(debugLogRXTX, DisplayName::Hardware::debugLogRXTX);	×
56	//Attributes::addGroup(debugLogRXTX, Group::debug);
57	m_interfaceItems.add(debugLogRXTX);	×
58	}	×
59
60	CBUS::Config CBUSSettings::config() const	×
61	{
62	return CBUS::Config{
63	.engineKeepAlive = std::chrono::seconds(engineKeepAlive),	×
64	.dccAccessorySwitchTime = std::chrono::milliseconds(dccAccessorySwitchTime),	×
NEW 65	.shortEventNodeNumber = shortEventNodeNumber,	×
66	.hubEnabled = hubEnabled,	×
67	.hubLocalhostOnly = hubLocalhostOnly,	×
68	.hubPort = hubPort,	×
69	.debugLogRXTX = debugLogRXTX,	×
70	};	×
71	}

traintastic / traintastic / 24315872327

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous