Native code for ESPNOW feature #2218
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -115,6 +115,7 @@ | |||||
| "API_nanoFramework.TI.EasyLink": "OFF-default-ON-to-add-this-API", | ||||||
| "API_nanoFramework.Hardware.Esp32.Rmt": "OFF-default-ON-to-add-this-API", | ||||||
| "API_nanoFramework.Device.Bluetooth": "OFF-default-ON-to-add-this-API", | ||||||
| "API_nanoFramework.Espnow": "OFF-default-ON-to-add-this-API", | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| "API_System.Device.WiFi": "OFF-default-ON-to-add-this-API" | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -39,6 +39,8 @@ option(API_nanoFramework.Device.Bluetooth "option for nanoFramework.Device | |||||
| # Esp32 only | ||||||
| option(API_Hardware.Esp32 "option for Hardware.Esp32") | ||||||
| option(API_nanoFramework.Hardware.Esp32.Rmt "option for nanoFramework.Hardware.Esp32.Rmt") | ||||||
| option(API_nanoFramework.Espnow "option for nanoFramework.Espnow") | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
| # Stm32 only | ||||||
|
|
@@ -177,6 +179,12 @@ if(API_nanoFramework.Hardware.Esp32.Rmt) | |||||
| PerformSettingsForApiEntry("nanoFramework.Hardware.Esp32.Rmt") | ||||||
| endif() | ||||||
|
|
||||||
| # nanoFramework.Espnow | ||||||
| if(API_nanoFramework.Espnow) | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| ##### API name here (doted name) | ||||||
| PerformSettingsForApiEntry("nanoFramework.Espnow") | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| endif() | ||||||
|
|
||||||
| # nanoFramework.Device.Bluetooth | ||||||
| if(API_nanoFramework.Device.Bluetooth) | ||||||
| ##### API name here (doted name) | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| # | ||
| # Copyright (c) .NET Foundation and Contributors | ||
| # See LICENSE file in the project root for full license information. | ||
| # | ||
|
|
||
| # native code directory | ||
| set(BASE_PATH_FOR_THIS_MODULE ${BASE_PATH_FOR_CLASS_LIBRARIES_MODULES}/nanoFramework.Espnow) | ||
|
There was a problem hiding this comment. Please rename file and options to match the option EspNow (mind the capital N) |
||
|
|
||
|
|
||
| # set include directories | ||
| list(APPEND nanoFramework.Espnow_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/src/CLR/Core) | ||
| list(APPEND nanoFramework.Espnow_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/src/CLR/Include) | ||
| list(APPEND nanoFramework.Espnow_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/src/HAL/Include) | ||
| list(APPEND nanoFramework.Espnow_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/src/PAL/Include) | ||
| list(APPEND nanoFramework.Espnow_INCLUDE_DIRS ${BASE_PATH_FOR_THIS_MODULE}) | ||
| list(APPEND nanoFramework.Espnow_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/src/nanoFramework.Espnow) | ||
|
|
||
| # source files | ||
| set(nanoFramework.Espnow_SRCS | ||
|
|
||
| nanoFramework_espnow_native.cpp | ||
|
|
||
|
|
||
| nanoFramework_espnow_native_nanoFramework_Espnow_EspNowController.cpp | ||
| nanoFramework_espnow_native_nanoFramework_Espnow_EspNowController__EspNowEventHandler.cpp | ||
|
|
||
| ) | ||
|
|
||
| foreach(SRC_FILE ${nanoFramework.Espnow_SRCS}) | ||
| set(nanoFramework.Espnow_SRC_FILE SRC_FILE-NOTFOUND) | ||
| find_file(nanoFramework.Espnow_SRC_FILE ${SRC_FILE} | ||
| PATHS | ||
| ${BASE_PATH_FOR_THIS_MODULE} | ||
| ${TARGET_BASE_LOCATION} | ||
| ${PROJECT_SOURCE_DIR}/src/nanoFramework.Espnow | ||
|
|
||
| CMAKE_FIND_ROOT_PATH_BOTH | ||
| ) | ||
| # message("${SRC_FILE} >> ${nanoFramework.Espnow_SRC_FILE}") # debug helper | ||
|
There was a problem hiding this comment. Please follow the same pattern as the other CMake on the inclusion of this line with the debug output option |
||
| list(APPEND nanoFramework.Espnow_SOURCES ${nanoFramework.Espnow_SRC_FILE}) | ||
| endforeach() | ||
|
|
||
| include(FindPackageHandleStandardArgs) | ||
|
|
||
| FIND_PACKAGE_HANDLE_STANDARD_ARGS(nanoFramework.Espnow DEFAULT_MSG nanoFramework.Espnow_INCLUDE_DIRS nanoFramework.Espnow_SOURCES) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -180,9 +180,9 @@ elseif ($TargetBoard -eq "ESP32_WROOM_32") { | |||||
| -DAPI_nanoFramework.System.Collections=ON | ||||||
| -DAPI_nanoFramework.System.Text=ON | ||||||
| -DAPI_nanoFramework.Hardware.Esp32.Rmt=ON | ||||||
| -DAPI_nanoFramework.Espnow=ON | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| -DAPI_System.Device.Dac=ON | ||||||
| "@ | ||||||
| # CMake prep | ||||||
| $cmakePrep = @" | ||||||
| -G Ninja | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2844,6 +2844,9 @@ static const TypeIndexLookup c_TypeIndexLookup[] = { | |
|
|
||
| TIL("nanoFramework.Hardware.Esp32.Rmt", "RmtCommand", m_RmtCommand), | ||
|
|
||
| TIL("nanoFramework.Espnow", "DataSentEventInternal", m_EspNowDataSentEvent), | ||
| TIL("nanoFramework.Espnow", "DataRecvEventInternal", m_EspNowDataRecvEvent), | ||
|
|
||
| #undef TIL | ||
| }; | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1581,6 +1581,9 @@ struct CLR_RT_WellKnownTypes | |
|
|
||
| CLR_RT_TypeDef_Index m_RmtCommand; | ||
|
|
||
| CLR_RT_TypeDef_Index m_EspNowDataRecvEvent; | ||
| CLR_RT_TypeDef_Index m_EspNowDataSentEvent; | ||
|
|
||
| PROHIBIT_COPY_CONSTRUCTORS(CLR_RT_WellKnownTypes); | ||
| }; | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -112,6 +112,9 @@ typedef enum SLEEP_LEVEL | |
| #define EVENT_TOUCH 120 | ||
| #define EVENT_GESTURE 130 | ||
|
|
||
| // keep in sync with nanoFramework.Espnow.EspNowController | ||
| #define EVENT_ESPNOW 140 | ||
|
|
||
| #define PAL_EVENT_TOUCH 0x1 | ||
| #define PAL_EVENT_KEY 0x2 | ||
| #define PAL_EVENT_MOUSE 0x4 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -65,6 +65,7 @@ | |
| "API_System.Device.Spi": "ON", | ||
| "API_Hardware.Esp32": "ON", | ||
| "API_nanoFramework.Hardware.Esp32.Rmt": "ON", | ||
| "API_nanoFramework.Espnow": "ON", | ||
|
|
||
| "API_nanoFramework.Devices.OneWire": "ON", | ||
| "API_nanoFramework.Graphics": "OFF", | ||
| "API_nanoFramework.Device.Bluetooth": "OFF" | ||
|
|
@@ -113,6 +114,7 @@ | |
| "API_System.Device.Spi": "ON", | ||
| "API_Hardware.Esp32": "ON", | ||
| "API_nanoFramework.Hardware.Esp32.Rmt": "ON", | ||
| "API_nanoFramework.Espnow": "ON", | ||
| "API_nanoFramework.Devices.OneWire": "ON", | ||
| "API_nanoFramework.Graphics": "OFF", | ||
| "API_nanoFramework.Device.Bluetooth": "OFF" | ||
|
|
@@ -162,6 +164,7 @@ | |
| "API_System.Device.Spi": "ON", | ||
| "API_Hardware.Esp32": "ON", | ||
| "API_nanoFramework.Hardware.Esp32.Rmt": "ON", | ||
| "API_nanoFramework.Espnow": "ON", | ||
| "API_nanoFramework.Devices.OneWire": "ON", | ||
| "API_nanoFramework.Graphics": "OFF", | ||
| "API_nanoFramework.Device.Bluetooth": "ON" | ||
|
|
@@ -212,6 +215,7 @@ | |
| "API_System.Device.Spi": "ON", | ||
| "API_Hardware.Esp32": "ON", | ||
| "API_nanoFramework.Hardware.Esp32.Rmt": "ON", | ||
| "API_nanoFramework.Espnow": "ON", | ||
| "API_nanoFramework.Devices.OneWire": "ON", | ||
| "API_nanoFramework.Graphics": "OFF", | ||
| "API_nanoFramework.Device.Bluetooth": "OFF" | ||
|
|
@@ -260,6 +264,7 @@ | |
| "API_Windows.Storage": "ON", | ||
| "API_Hardware.Esp32": "ON", | ||
| "API_nanoFramework.Hardware.Esp32.Rmt": "ON", | ||
| "API_nanoFramework.Espnow": "ON", | ||
| "API_nanoFramework.Device.Bluetooth": "OFF", | ||
| "API_nanoFramework.Graphics": "ON", | ||
| "GRAPHICS_DISPLAY": "ILI9341_240x320_SPI.cpp", | ||
|
|
@@ -311,6 +316,7 @@ | |
| "API_Windows.Storage": "ON", | ||
| "API_Hardware.Esp32": "ON", | ||
| "API_nanoFramework.Hardware.Esp32.Rmt": "ON", | ||
| "API_nanoFramework.Espnow": "ON", | ||
| "API_nanoFramework.Device.Bluetooth": "OFF", | ||
| "API_nanoFramework.Graphics": "ON", | ||
| "GRAPHICS_DISPLAY": "ILI9341_240x320_SPI.cpp", | ||
|
|
@@ -416,6 +422,7 @@ | |
| "API_System.Device.Spi": "ON", | ||
| "API_Hardware.Esp32": "ON", | ||
| "API_nanoFramework.Hardware.Esp32.Rmt": "ON", | ||
| "API_nanoFramework.Espnow": "ON", | ||
| "API_nanoFramework.Devices.OneWire": "ON", | ||
| "API_nanoFramework.Graphics": "OFF", | ||
| "API_nanoFramework.Device.Bluetooth": "OFF" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -68,6 +68,7 @@ | |
| "API_System.Device.Spi": "ON", | ||
| "API_Hardware.Esp32": "ON", | ||
| "API_nanoFramework.Hardware.Esp32.Rmt": "ON", | ||
| "API_nanoFramework.Espnow": "ON", | ||
| "API_nanoFramework.Devices.OneWire": "OFF", | ||
| "API_nanoFramework.Graphics": "OFF", | ||
| "API_nanoFramework.Device.Bluetooth": "OFF" | ||
|
|
@@ -114,6 +115,7 @@ | |
| "API_System.Device.Spi": "ON", | ||
| "API_Hardware.Esp32": "ON", | ||
| "API_nanoFramework.Hardware.Esp32.Rmt": "ON", | ||
| "API_nanoFramework.Espnow": "ON", | ||
| "API_nanoFramework.Device.Bluetooth": "OFF", | ||
| "API_nanoFramework.Devices.OneWire": "OFF", | ||
| "API_nanoFramework.Graphics": "ON", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| #include "nanoFramework_espnow_native.h" | ||
|
|
||
|
|
||
| // clang-format off | ||
|
|
||
| static const CLR_RT_MethodHandler method_lookup[] = | ||
| { | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| Library_nanoFramework_espnow_native_nanoFramework_Espnow_EspNowController::NativeInitialize___I4, | ||
| Library_nanoFramework_espnow_native_nanoFramework_Espnow_EspNowController::NativeDispose___VOID__BOOLEAN, | ||
| Library_nanoFramework_espnow_native_nanoFramework_Espnow_EspNowController::NativeEspNowSend___I4__SZARRAY_U1__SZARRAY_U1__I4, | ||
| Library_nanoFramework_espnow_native_nanoFramework_Espnow_EspNowController::NativeEspNowAddPeer___I4__SZARRAY_U1__U1, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| Library_nanoFramework_espnow_native_nanoFramework_Espnow_EspNowController__EspNowEventHandler::ProcessEvent___nanoFrameworkRuntimeEventsBaseEvent__U4__U4__SystemDateTime, | ||
| NULL, | ||
| NULL, | ||
| }; | ||
|
|
||
| const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_nanoFramework_Espnow = | ||
| { | ||
| "nanoFramework.Espnow", | ||
| 0x3C8132ED, | ||
| method_lookup, | ||
| { 0, 9, 99, 999 } | ||
| }; | ||
|
|
||
| // clang-format on | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changes in this file don't belong to this PR, please revert.