Downintegrate changes from the OpenMRNIDF repository #771

balazsracz · 2024-02-02T02:05:00Z

This PR pulls in changes that happened in the OpenMRNIDF repository. Most of these were authored by Mike Dunston.

All instances of ifdef ESP32 replaced with ESP_PLATFORM
Removed conditional code for supporting ESP-IDF v3.x and v4.x
Only ESP-IDF v5 and up is now supported
new feature for OPENMRN_HAVE_SOCKET_FSTAT
fixed compile errors around spiram
refactored definition of ADC pin into a separate class in a separate file
fixes around printf PRIu32.
do not print error messages on CAN overflow
fix to not start the hub twice in the wifi manager
Remove deprecated hardware can driver
Adds I2C driver written by Mike Dunston for the ESP32.

- All instances of ifdef ESP32 replaced with ESP_PLATFORM - Removed conditional code for supporting ESP-IDF v3.x and v4.x Only ESP-IDF v5 and up is now supported - new feature for OPENMRN_HAVE_SOCKET_FSTAT - fixed compile errors around spiram - refactored definition of ADC pin. - fixes around printf PRIu32. - do not print error messages on CAN overflow - fix to not start the hub twice in the wifi manager

atanisoft · 2024-02-02T13:58:04Z

src/freertos_drivers/esp32/Esp32Gpio.hxx

-#else
-#include <esp32/rom/gpio.h>
-#endif
+#include <soc/adc_channel.h>


this line likely can be removed as part of the split of ADC to it's own file. It looks like I missed this during the split.

I will also remove the ADC macro from below.

atanisoft · 2024-02-02T13:59:54Z

src/freertos_drivers/esp32/Esp32HardwareTwai.cxx

@@ -716,7 +714,7 @@ static void twai_isr(void *arg)
 {
    BaseType_t wakeup = pdFALSE;
    uint32_t events = twai_hal_get_events(&twai.context);
-    ESP_EARLY_LOGV(TWAI_LOG_TAG, "events: %08x", events);
+    ESP_EARLY_LOGV(TWAI_LOG_TAG, "events: %04x", events);


Would it make sense to use PRIx32 here? I haven't test it but I think it should work.

atanisoft · 2024-02-02T14:07:09Z

Thanks @balazsracz for taking this on, I had a local branch to do similarly but held off on pushing it upstream due to various commitments.

One thing to note, we should publish a "final" OpenMRNLite version prior to merge since arduino-esp32 2.x has a hard dependency on IDF v4.4.x and arduino-esp32 3.x is still under development using IDF v5.1.x. We might consider bumping the OpenMRNLite version when the IDF v5.x dependency version has been released.

atanisoft · 2024-02-03T15:13:12Z

src/freertos_drivers/esp32/Esp32HardwareTwai.cxx

+                ",discard:%" PRIu32 ",missed:%" PRIu32 ",lost:%" PRIu32 ") "
+                "TX:%" PRIu32 " (pending:%zu,suc:%" PRIu32
+                ",fail:%" PRIu32 ") "
+                "Bus (arb-err:%" PRIu32 ",err:%" PRIu32 ",state:%s)",


https://github.com/atanisoft/OpenMRNIDF/pull/7/files#diff-88ee088b2bbc83933050861edc298188dbc20d3dbc31bf2fa003d9ae7c989603 has changed all of the types for these values from uint32_t to size_t which cleans up this log statement considerably.

Let's do that in a different round. I have not reviewed the 5.1.0 changes yet.

That's fine, the bulk of the changes you have already pulled in, it's mostly further cleanup and adjustments for 5.1/5.2 and those are minimilar IIRC

atanisoft · 2024-02-03T15:14:10Z

src/freertos_drivers/esp32/Esp32Ledc.cxx

@@ -35,10 +35,6 @@
 // Ensure we only compile this code for the ESP32 family of MCUs.
 #if defined(ESP32)


missed update from ESP32 -> ESP_PLATFORM

atanisoft · 2024-02-03T15:22:17Z

src/freertos_drivers/esp32/Esp32HardwareTwai.cxx

@@ -37,12 +37,9 @@

 // Ensure we only compile this code for the ESP32 family of MCUs and that the
 // ESP-IDF version is supported for this code.


we can truncate this comment after MCUs.

atanisoft · 2024-02-03T15:25:16Z

src/openlcb/Bootloader.hxx

@@ -43,7 +43,7 @@
 #include <string.h>
 #include <unistd.h>

-#ifdef ESP32
+#ifdef ESP_PLATFORM
 #include "bootloader_hal.h"
 #else
 #include "freertos/bootloader_hal.h"


I think we should modify libify.sh to create the freertos directory so we can consolidate these include paths, I think we had discussed this but haven't implemented a fix yet

* 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.

…-merge * bracz-esp-compiler-warnings: Fix compiler warnings in openmrn when using new GCC's. (#772) Fix comment. 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)

* bracz-tmp-compile-fix-merge: Fix compiler warnings in openmrn when using new GCC's. (#772) Fix comment. 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)

* bracz-stat-max: Latency test with maximum stats and custom process evaluation (#773) Fixes data type of max. Fix comment. Adds documentation comment to latency test consumer. Fix compiler warnings in openmrn when using new GCC's. (#772) Fix comment. 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)

* 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)

…t-hub-router # By Balazs Racz (26) and others * 'master' of github.com:bakerstu/openmrn: (28 commits) Fix build of esp8266 train implementation. Removes unnecessary includes that might not exist on an embedded compiler. Fix compilation of TempFile under esp8266. Add libatomic to esp8266 nonos target. Fix compile errors in time_client app. Fixes in file memory space: (#786) Change startup state to stopped. (#784) Fixes write code for spiflash. (#782) Handles bus passive in TivaCan. (#781) Update libify to support IDF export with symlinks (#770) 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. ... # Conflicts: # src/utils/constants.cxx # src/utils/sources

* bracz-direct-hub-router: (35 commits) High-performance hub component for dealing with many sockets and high throughput (#760) Fix test build. Fixed comment and adds a todo. Remove unnecessary log. Fix comments and reduce unnecessary log level. FIx comments. Fix build of esp8266 train implementation. Removes unnecessary includes that might not exist on an embedded compiler. Fix compilation of TempFile under esp8266. Add libatomic to esp8266 nonos target. Fix compile errors in time_client app. Fixes in file memory space: (#786) Change startup state to stopped. (#784) Fixes write code for spiflash. (#782) Handles bus passive in TivaCan. (#781) Update libify to support IDF export with symlinks (#770) 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) ...

balazsracz added 5 commits February 1, 2024 18:02

Fix compile error.

2591593

Remove deprecated hardware can driver.

04e9951

Adds I2C driver written by Mike Dunston for the ESP32.

cc0f25e

Adds refactored Adc Input class.

57d5873

balazsracz requested a review from atanisoft February 2, 2024 02:05

balazsracz mentioned this pull request Feb 2, 2024

Update from upstream changes. balazsracz/OpenMRNIDF#2

Open

atanisoft approved these changes Feb 2, 2024

View reviewed changes

atanisoft reviewed Feb 3, 2024

View reviewed changes

balazsracz mentioned this pull request Feb 4, 2024

Cleanup esp32 include directories #778

Open

Fix comments.

c5adf0c

balazsracz merged commit 8c7cc44 into master Feb 4, 2024
4 checks passed

balazsracz deleted the bracz-idf-downintegrate branch February 4, 2024 15:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Downintegrate changes from the OpenMRNIDF repository #771

Downintegrate changes from the OpenMRNIDF repository #771

balazsracz commented Feb 2, 2024

atanisoft Feb 2, 2024

balazsracz Feb 4, 2024

balazsracz Feb 4, 2024 •

edited

Loading

atanisoft Feb 2, 2024

balazsracz Feb 4, 2024

atanisoft commented Feb 2, 2024

atanisoft Feb 3, 2024

balazsracz Feb 4, 2024

atanisoft Feb 4, 2024

atanisoft Feb 3, 2024

balazsracz Feb 4, 2024

atanisoft Feb 3, 2024

balazsracz Feb 4, 2024

atanisoft Feb 3, 2024

balazsracz Feb 4, 2024

		@@ -35,10 +35,6 @@
		// Ensure we only compile this code for the ESP32 family of MCUs.
		#if defined(ESP32)

		@@ -37,12 +37,9 @@

		// Ensure we only compile this code for the ESP32 family of MCUs and that the
		// ESP-IDF version is supported for this code.

Downintegrate changes from the OpenMRNIDF repository #771

Downintegrate changes from the OpenMRNIDF repository #771

Conversation

balazsracz commented Feb 2, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

balazsracz Feb 4, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

atanisoft commented Feb 2, 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

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

balazsracz Feb 4, 2024 •

edited

Loading