Accessory packet refactoring and POM support #764

balazsracz · 2024-01-06T21:43:15Z

Adds support for Accessory packet POM. This works by combining a new call add_accy_address() with the already existing add_pom_write1(...)
Refactors the basic accessory packet generator to use some constants and the new accy address call.
Adds helper functions to translate user-visible accessory addresses to binary accessory addresses and reverse.
Updates the DccDebug code to print the user-visible accessory addresses for those packets.

This uses user address 1..2047, with skipping the former broadcast address.

Adds "add_accy_address" helper to allow accy POM commands as well. Refactors the basic accy function to make use of the new code. Unit tests are not changed by this refactoring.

* master: Fix test flakiness. Fix compile error on FdUtils under freertos.

Adjusts the dccdebug for the new RCN-213 and DCC 9.2.1 standard encoding.

Adds an example dcc basic accy POM packet to the test.

atanisoft · 2024-01-08T13:50:03Z

src/dcc/Defs.hxx

@@ -50,6 +50,11 @@ enum class TrainAddressType : uint8_t
    DCC_LONG_ADDRESS,
    /// Marklin-motorola packets. Addresses 1..80 are supported.
    MM,
+    /// Per-output addressing of DCC basic accessories. (user facing is 1 to
+    /// 2047, internal is 0 to 2047)


2048 for user facing? Should a note be added on 2045-2048 being reserved?

2048 for user facing. No note is required. 2045 to 2048 are not special anymore. This is a change in the RailCommunity standards which the NMRA also intends to adopt. See the table starting on page 16: https://www.nmra.org/sites/default/files/standards/sandrp/pdf/s-9.2.1_dcc_extended_packet_formats_draft5-12-2023.pdf

balazsracz · 2024-01-08T14:28:50Z

Actually it should read 1..2048 for user facing. There is nothing reserved, 2045 to 2048 are also valid. This is a relatively new addition / change to the DCC standard. See RCN-213 and the 2023-05 draft of the NMRA S-9.2.1.

atanisoft · 2024-01-08T14:52:43Z

There is nothing reserved, 2045 to 2048 are also valid. This is a relatively new addition / change to the DCC standard. See RCN-213 and the 2023-05 draft of the NMRA S-9.2.1.

Good to know, there is a note in DccAccyConsumer/Producer that indicates the address is limited to 1-2044.

The most recent draft of 9.2.1 is a great improvement and simplifies most of the details greatly.

bakerstu · 2024-01-21T16:28:00Z

src/dcc/Defs.hxx

@@ -50,6 +50,11 @@ enum class TrainAddressType : uint8_t
    DCC_LONG_ADDRESS,
    /// Marklin-motorola packets. Addresses 1..80 are supported.
    MM,
+    /// Per-output addressing of DCC basic accessories. (user facing is 1 to
+    /// 2047, internal is 0 to 2047)


2048 for user facing. No note is required. 2045 to 2048 are not special anymore. This is a change in the RailCommunity standards which the NMRA also intends to adopt. See the table starting on page 16: https://www.nmra.org/sites/default/files/standards/sandrp/pdf/s-9.2.1_dcc_extended_packet_formats_draft5-12-2023.pdf

bakerstu · 2024-01-21T16:31:11Z

src/dcc/Defs.hxx

+    /// Per-output addressing of DCC basic accessories. (user facing is 1 to
+    /// 2047, internal is 0 to 2047)
+    DCC_ACCY_BASIC_OUTPUT,
+    /// DCC 11-bit extended accessory decoder address (1 to 2047).


(1 to 2048).

I replaced this with the text from basic accy:

(user facing is 1 to 2048, internal is 0 to 2047)

bakerstu · 2024-01-21T16:35:20Z

src/dcc/Packet.cxxtest

+            Defs::accy_address_binary_to_user(
+                Defs::accy_address_user_to_binary(user)));
+    }
+    for (unsigned binary = 0; binary < 2048; ++binary)


Would it be clearer to use <= 2047 to be consistent with the previous for loop?

* master: Accessory packet refactoring and POM support (#764)

* bracz-accy-packet-with-pom: Accessory packet refactoring and POM support (#764)

* master: Fixes file comment. Adds an application (hub_test) for testing the throughput of a hub or a CAN-bus (#762) Adds a helper function to decode a 14-bit 9.2.1.1 address into address type and raw address. (#766) Fix broken test. Accessory packet refactoring and POM support (#764) Adds support for Offset(n) attribute in the CDI (#765) Adds local loopback to TractionThrottle. (#756) Fix test flakiness. Fix compile error on FdUtils under freertos.

* master: Upintegrate changes from the OpenMRNIDF repository (#771) Adds support for DCC extended accessories (#769) Fix incorrect consumer identified message being emitted by dcc accy producer. (#768) Avoids rendering hidden segments. (#767) Adds trailing zero to the cdi XML file written to the filesystem. (#777) Fix target subdirectory name (#775) Fixes file comment. Adds an application (hub_test) for testing the throughput of a hub or a CAN-bus (#762) Adds a helper function to decode a 14-bit 9.2.1.1 address into address type and raw address. (#766) Fix broken test. Accessory packet refactoring and POM support (#764) Adds support for Offset(n) attribute in the CDI (#765) Adds local loopback to TractionThrottle. (#756) Fix test flakiness. Fix compile error on FdUtils under freertos.

* bracz-idf-downintegrate: Upintegrate changes from the OpenMRNIDF repository (#771) Fix comments. Adds support for DCC extended accessories (#769) Fix incorrect consumer identified message being emitted by dcc accy producer. (#768) Avoids rendering hidden segments. (#767) Adds trailing zero to the cdi XML file written to the filesystem. (#777) Fix target subdirectory name (#775) Fixes file comment. Adds an application (hub_test) for testing the throughput of a hub or a CAN-bus (#762) Adds a helper function to decode a 14-bit 9.2.1.1 address into address type and raw address. (#766) Fix broken test. Accessory packet refactoring and POM support (#764) Adds support for Offset(n) attribute in the CDI (#765) Adds local loopback to TractionThrottle. (#756) Fix test flakiness. Fix compile error on FdUtils under freertos.

* master: Fix esp32 select race conditions. (#780) Latency test with maximum stats and custom process evaluation (#773) Fix compiler warnings in openmrn when using new GCC's. (#772) Upintegrate changes from the OpenMRNIDF repository (#771) Adds support for DCC extended accessories (#769) Fix incorrect consumer identified message being emitted by dcc accy producer. (#768) Avoids rendering hidden segments. (#767) Adds trailing zero to the cdi XML file written to the filesystem. (#777) Fix target subdirectory name (#775) Fixes file comment. Adds an application (hub_test) for testing the throughput of a hub or a CAN-bus (#762) Adds a helper function to decode a 14-bit 9.2.1.1 address into address type and raw address. (#766) Fix broken test. Accessory packet refactoring and POM support (#764)

balazsracz added 8 commits January 6, 2024 15:55

Adds user visible address to the DCC debug utility's ACCY decoding.

84f51b5

This uses user address 1..2047, with skipping the former broadcast address.

Adds address types for DCC basic and extended accessories.

e10bb66

Adds constants for DCC accy basic and extended packets.

33f4d4c

Adds "add_accy_address" helper to allow accy POM commands as well. Refactors the basic accy function to make use of the new code. Unit tests are not changed by this refactoring.

Adds code to convert an accy user address to binary address.

f0f4204

Fix test flakiness.

7ffab64

Merge branch 'master' into bracz-accy-packet-with-pom

924e7a8

* master: Fix test flakiness. Fix compile error on FdUtils under freertos.

Uses the user address decoding function in the DccDebug code.

6912058

Adjusts the dccdebug for the new RCN-213 and DCC 9.2.1 standard encoding.

Adds a feature to set the options on a basic dcc accy packet.

1c6bdc1

Adds an example dcc basic accy POM packet to the test.

atanisoft reviewed Jan 8, 2024

View reviewed changes

bakerstu approved these changes Jan 21, 2024

View reviewed changes

Fix review comments

e72bf42

balazsracz merged commit d547864 into master Feb 1, 2024
4 checks passed

balazsracz deleted the bracz-accy-packet-with-pom branch February 1, 2024 11:52

balazsracz added a commit that referenced this pull request Feb 1, 2024

Merge branch 'master' into bracz-accy-packet-with-pom

f25f13d

* master: Accessory packet refactoring and POM support (#764)

balazsracz added a commit that referenced this pull request Feb 1, 2024

Merge branch 'bracz-accy-packet-with-pom' into bracz-dcc14-decode

3105baa

* bracz-accy-packet-with-pom: Accessory packet refactoring and POM support (#764)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Accessory packet refactoring and POM support #764

Accessory packet refactoring and POM support #764

balazsracz commented Jan 6, 2024

atanisoft Jan 8, 2024

bakerstu Jan 21, 2024

balazsracz Feb 1, 2024

balazsracz commented Jan 8, 2024 via email

atanisoft commented Jan 8, 2024

bakerstu Jan 21, 2024

bakerstu Jan 21, 2024

balazsracz Feb 1, 2024

bakerstu Jan 21, 2024

balazsracz Feb 1, 2024

Accessory packet refactoring and POM support #764

Accessory packet refactoring and POM support #764

Conversation

balazsracz commented Jan 6, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

balazsracz commented Jan 8, 2024 via email

atanisoft commented Jan 8, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment