From 3b287c9ee29e9c5594b22e04ebc05c6294678c06 Mon Sep 17 00:00:00 2001 From: nfbot Date: Thu, 6 Jan 2022 15:25:42 +0000 Subject: [PATCH] Code style fixes Automated fixes for code style. --- src/HAL/Include/nanoHAL_v2.h | 1 - ...noFramework_hardware_esp32_espnow_native.h | 54 +++++------ ...Hardware_Esp32_EspNow_EspNowController.cpp | 43 ++++++--- ...w_EspNowController__EspNowEventHandler.cpp | 89 ++++++++++--------- 4 files changed, 106 insertions(+), 81 deletions(-) diff --git a/src/HAL/Include/nanoHAL_v2.h b/src/HAL/Include/nanoHAL_v2.h index 11c4dee513..4888c35035 100644 --- a/src/HAL/Include/nanoHAL_v2.h +++ b/src/HAL/Include/nanoHAL_v2.h @@ -115,7 +115,6 @@ typedef enum SLEEP_LEVEL // keep in sync with nanoFramework.Hardware.Esp32.EspNow.EspNowController #define EVENT_ESP32_ESPNOW 140 - #define PAL_EVENT_TOUCH 0x1 #define PAL_EVENT_KEY 0x2 #define PAL_EVENT_MOUSE 0x4 diff --git a/targets/ESP32/_nanoCLR/nanoFramework.Hardware.Esp32.EspNow/nanoFramework_hardware_esp32_espnow_native.h b/targets/ESP32/_nanoCLR/nanoFramework.Hardware.Esp32.EspNow/nanoFramework_hardware_esp32_espnow_native.h index be6b5526c0..3823de8e56 100644 --- a/targets/ESP32/_nanoCLR/nanoFramework.Hardware.Esp32.EspNow/nanoFramework_hardware_esp32_espnow_native.h +++ b/targets/ESP32/_nanoCLR/nanoFramework.Hardware.Esp32.EspNow/nanoFramework_hardware_esp32_espnow_native.h @@ -1,6 +1,6 @@ //----------------------------------------------------------------------------- // -// ** WARNING! ** +// ** WARNING! ** // This file was generated automatically by a tool. // Re-running the tool will overwrite this file. // You should copy this file to a custom location @@ -24,38 +24,45 @@ //#define DEBUG_ESPNOW 1 -#define DEBUG_FENTER() DEBUG_WRITELINE("entry") -#define DEBUG_FEXIT() DEBUG_WRITELINE("exit") +#define DEBUG_FENTER() DEBUG_WRITELINE("entry") +#define DEBUG_FEXIT() DEBUG_WRITELINE("exit") #define DEBUG_FEXIT_RET(v) DEBUG_WRITELINE("return: %d", v) #if defined(DEBUG_ESPNOW) - #define DEBUG_WRITELINE(...) \ - { \ - char temporaryStringBuffer1[64]; \ - snprintf(temporaryStringBuffer1, sizeof(temporaryStringBuffer1), __VA_ARGS__); \ - char temporaryStringBuffer2[128]; \ - int realStringSize=snprintf(temporaryStringBuffer2, sizeof(temporaryStringBuffer2), "\r\n[%s] %s\r\n", __func__, temporaryStringBuffer1); \ - CLR_EE_DBG_EVENT_BROADCAST( CLR_DBG_Commands_c_Monitor_Message, realStringSize, temporaryStringBuffer2, WP_Flags_c_NonCritical | WP_Flags_c_NoCaching ); \ +#define DEBUG_WRITELINE(...) \ + { \ + char temporaryStringBuffer1[64]; \ + snprintf(temporaryStringBuffer1, sizeof(temporaryStringBuffer1), __VA_ARGS__); \ + char temporaryStringBuffer2[128]; \ + int realStringSize = snprintf( \ + temporaryStringBuffer2, \ + sizeof(temporaryStringBuffer2), \ + "\r\n[%s] %s\r\n", \ + __func__, \ + temporaryStringBuffer1); \ + CLR_EE_DBG_EVENT_BROADCAST( \ + CLR_DBG_Commands_c_Monitor_Message, \ + realStringSize, \ + temporaryStringBuffer2, \ + WP_Flags_c_NonCritical | WP_Flags_c_NoCaching); \ } -#else - #define DEBUG_WRITELINE(...) ; +#else +#define DEBUG_WRITELINE(...) ; #endif - #define EVENT_ESP32_ESPNOW_DATASENT 1 #define EVENT_ESP32_ESPNOW_DATARECV 2 - struct EspNowDataSentEventData { - uint8_t peer_mac[ESP_NOW_ETH_ALEN]; + uint8_t peer_mac[ESP_NOW_ETH_ALEN]; esp_now_send_status_t status; }; struct EspNowDataRecvEventData { - uint8_t peer_mac[ESP_NOW_ETH_ALEN]; + uint8_t peer_mac[ESP_NOW_ETH_ALEN]; uint8_t data[ESP_NOW_MAX_DATA_LEN]; int dataLen; }; @@ -67,7 +74,6 @@ struct Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware static const int FIELD__DataLen = 3; //--// - }; struct Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_DataRecvEventInternal @@ -77,7 +83,6 @@ struct Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware static const int FIELD__DataLen = 5; //--// - }; struct Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_DataSentEventArgs @@ -86,7 +91,6 @@ struct Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware static const int FIELD__Status = 2; //--// - }; struct Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_DataSentEventInternal @@ -95,7 +99,6 @@ struct Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware static const int FIELD__Status = 4; //--// - }; struct Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController @@ -117,11 +120,11 @@ struct Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware static EspNowDataRecvEventData dataRecvEventData; static void DataSentCb(const uint8_t *mac_addr, esp_now_send_status_t status); - static void DataRecvCb(const uint8_t * mac, const uint8_t *incomingData, int len); + static void DataRecvCb(const uint8_t *mac, const uint8_t *incomingData, int len); }; - -struct Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController__EspNowEventHandler +struct + Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController__EspNowEventHandler { static const int FIELD__controllerInstance = 1; @@ -132,18 +135,15 @@ struct Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware static HRESULT CopyByteArrayToCLRArray(CLR_RT_HeapBlock &target, uint8_t *src, CLR_UINT32 length); static HRESULT ProcessEvent_DataSent(CLR_RT_StackFrame &stack); static HRESULT ProcessEvent_DataRecv(CLR_RT_StackFrame &stack); - }; - struct Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowException { static const int FIELD__esp_err = 5; //--// - }; extern const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_nanoFramework_Hardware_Esp32_EspNow; -#endif //_NANOFRAMEWORK_HARDWARE_ESP32_ESPNOW_NATIVE_H_ +#endif //_NANOFRAMEWORK_HARDWARE_ESP32_ESPNOW_NATIVE_H_ diff --git a/targets/ESP32/_nanoCLR/nanoFramework.Hardware.Esp32.EspNow/nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController.cpp b/targets/ESP32/_nanoCLR/nanoFramework.Hardware.Esp32.EspNow/nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController.cpp index 3b1e92efab..7afabf2e0d 100644 --- a/targets/ESP32/_nanoCLR/nanoFramework.Hardware.Esp32.EspNow/nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController.cpp +++ b/targets/ESP32/_nanoCLR/nanoFramework.Hardware.Esp32.EspNow/nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController.cpp @@ -12,14 +12,15 @@ #include "nanoFramework_hardware_esp32_espnow_native.h" -EspNowDataSentEventData Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController:: - dataSentEventData; -EspNowDataRecvEventData Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController:: - dataRecvEventData; - +EspNowDataSentEventData + Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController:: + dataSentEventData; +EspNowDataRecvEventData + Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController:: + dataRecvEventData; void Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController:: - DataSentCb(const uint8_t *mac_addr, esp_now_send_status_t status) + DataSentCb(const uint8_t *mac_addr, esp_now_send_status_t status) { DEBUG_FENTER(); @@ -36,7 +37,7 @@ void Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_E } void Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController:: - DataRecvCb(const uint8_t * mac_addr, const uint8_t *incomingData, int len) + DataRecvCb(const uint8_t *mac_addr, const uint8_t *incomingData, int len) { DEBUG_FENTER(); @@ -54,7 +55,7 @@ void Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_E } HRESULT Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController:: - NativeInitialize___I4( CLR_RT_StackFrame &stack ) + NativeInitialize___I4(CLR_RT_StackFrame &stack) { NANOCLR_HEADER(); @@ -88,7 +89,7 @@ HRESULT Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardwar } HRESULT Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController:: - NativeDispose___VOID__BOOLEAN( CLR_RT_StackFrame &stack ) + NativeDispose___VOID__BOOLEAN(CLR_RT_StackFrame &stack) { NANOCLR_HEADER(); @@ -103,7 +104,6 @@ HRESULT Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardwar NANOCLR_NOCLEANUP_NOLABEL(); } - HRESULT Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController:: NativeEspNowSend___I4__SZARRAY_U1__SZARRAY_U1__I4(CLR_RT_StackFrame &stack) { @@ -121,7 +121,16 @@ HRESULT Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardwar int32_t dataLen = stack.Arg3().NumericByRef().s4; - DEBUG_WRITELINE("sending %d: bytes to peer mac: %x:%x:%x:%x:%x:%x, data[0]: %x", dataLen, peerMac[0], peerMac[1], peerMac[2], peerMac[3], peerMac[4], peerMac[5], data[0]); + DEBUG_WRITELINE( + "sending %d: bytes to peer mac: %x:%x:%x:%x:%x:%x, data[0]: %x", + dataLen, + peerMac[0], + peerMac[1], + peerMac[2], + peerMac[3], + peerMac[4], + peerMac[5], + data[0]); ret = esp_now_send((const uint8_t *)peerMac, (const uint8_t *)data, dataLen); @@ -147,13 +156,21 @@ HRESULT Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardwar uint8_t channel = (uint8_t)stack.Arg2().NumericByRef().u1; esp_now_peer_info_t peerInfo; - memset((void*)&peerInfo, 0, sizeof(peerInfo)); + memset((void *)&peerInfo, 0, sizeof(peerInfo)); memcpy(peerInfo.peer_addr, peerMac, ESP_NOW_ETH_ALEN); peerInfo.ifidx = WIFI_IF_STA; peerInfo.channel = channel; peerInfo.encrypt = false; - DEBUG_WRITELINE("add_peer, mac: %x:%x:%x:%x:%x:%x, ch: %d", peerMac[0], peerMac[1], peerMac[2], peerMac[3], peerMac[4], peerMac[5], channel); + DEBUG_WRITELINE( + "add_peer, mac: %x:%x:%x:%x:%x:%x, ch: %d", + peerMac[0], + peerMac[1], + peerMac[2], + peerMac[3], + peerMac[4], + peerMac[5], + channel); ret = esp_now_add_peer(&peerInfo); diff --git a/targets/ESP32/_nanoCLR/nanoFramework.Hardware.Esp32.EspNow/nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController__EspNowEventHandler.cpp b/targets/ESP32/_nanoCLR/nanoFramework.Hardware.Esp32.EspNow/nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController__EspNowEventHandler.cpp index c60b2eeb24..8dde13c9fe 100644 --- a/targets/ESP32/_nanoCLR/nanoFramework.Hardware.Esp32.EspNow/nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController__EspNowEventHandler.cpp +++ b/targets/ESP32/_nanoCLR/nanoFramework.Hardware.Esp32.EspNow/nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController__EspNowEventHandler.cpp @@ -1,6 +1,6 @@ //----------------------------------------------------------------------------- // -// ** WARNING! ** +// ** WARNING! ** // This file was generated automatically by a tool. // Re-running the tool will overwrite this file. // You should copy this file to a custom location @@ -12,20 +12,18 @@ #include "nanoFramework_hardware_esp32_espnow_native.h" -HRESULT Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController__EspNowEventHandler:: - CopyByteArrayToCLRArray(CLR_RT_HeapBlock & target, uint8_t * src, CLR_UINT32 length ) +HRESULT + Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController__EspNowEventHandler:: + CopyByteArrayToCLRArray(CLR_RT_HeapBlock &target, uint8_t *src, CLR_UINT32 length) { NANOCLR_HEADER(); DEBUG_FENTER(); - CLR_UINT8* firstTargetByte; - CLR_RT_HeapBlock_Array * targetArray; + CLR_UINT8 *firstTargetByte; + CLR_RT_HeapBlock_Array *targetArray; - NANOCLR_CHECK_HRESULT(CLR_RT_HeapBlock_Array::CreateInstance( - target, - length, - g_CLR_RT_WellKnownTypes.m_UInt8)); + NANOCLR_CHECK_HRESULT(CLR_RT_HeapBlock_Array::CreateInstance(target, length, g_CLR_RT_WellKnownTypes.m_UInt8)); targetArray = target.DereferenceArray(); if (!targetArray) @@ -36,15 +34,16 @@ HRESULT Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardwar DEBUG_WRITELINE("copying %d bytes", length); firstTargetByte = targetArray->GetFirstElement(); - memcpy( firstTargetByte, src, length ); + memcpy(firstTargetByte, src, length); DEBUG_FEXIT(); NANOCLR_NOCLEANUP(); } -HRESULT Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController__EspNowEventHandler:: - ProcessEvent_DataSent( CLR_RT_StackFrame &stack ) +HRESULT + Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController__EspNowEventHandler:: + ProcessEvent_DataSent(CLR_RT_StackFrame &stack) { NANOCLR_HEADER(); @@ -58,7 +57,7 @@ HRESULT Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardwar NANOCLR_CHECK_HRESULT( g_CLR_RT_ExecutionEngine.NewObjectFromIndex(clrRet, g_CLR_RT_WellKnownTypes.m_Esp32EspNowDataSentEvent)); - + dataSentEvent = clrRet.Dereference(); if (!dataSentEvent) { @@ -66,22 +65,27 @@ HRESULT Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardwar } // clrRet.PeerMac - NANOCLR_CHECK_HRESULT( - CopyByteArrayToCLRArray( - dataSentEvent[Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_DataSentEventInternal::FIELD__PeerMac], - sentEventData->peer_mac, - 6)); + NANOCLR_CHECK_HRESULT(CopyByteArrayToCLRArray( + dataSentEvent + [Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_DataSentEventInternal:: + FIELD__PeerMac], + sentEventData->peer_mac, + 6)); // clrRet.Status - dataSentEvent[Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_DataSentEventInternal::FIELD__Status].SetInteger(sentEventData->status); + dataSentEvent + [Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_DataSentEventInternal:: + FIELD__Status] + .SetInteger(sentEventData->status); DEBUG_FEXIT(); NANOCLR_NOCLEANUP(); } -HRESULT Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController__EspNowEventHandler:: - ProcessEvent_DataRecv( CLR_RT_StackFrame &stack ) +HRESULT + Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController__EspNowEventHandler:: + ProcessEvent_DataRecv(CLR_RT_StackFrame &stack) { NANOCLR_HEADER(); @@ -89,12 +93,12 @@ HRESULT Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardwar EspNowDataRecvEventData *recvEventData = (EspNowDataRecvEventData *)stack.Arg2().NumericByRef().u4; CLR_RT_HeapBlock *dataRecvEvent; - + // create nanoFramework.Hardware.Esp32.EspNow.EspNowController.DataRecvEventInternal instance to return CLR_RT_HeapBlock &clrRet = stack.PushValue(); NANOCLR_CHECK_HRESULT( g_CLR_RT_ExecutionEngine.NewObjectFromIndex(clrRet, g_CLR_RT_WellKnownTypes.m_Esp32EspNowDataRecvEvent)); - + dataRecvEvent = clrRet.Dereference(); if (!dataRecvEvent) { @@ -102,28 +106,35 @@ HRESULT Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardwar } // clrRet.PeerMac - NANOCLR_CHECK_HRESULT( - CopyByteArrayToCLRArray( - dataRecvEvent[Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_DataRecvEventInternal::FIELD__PeerMac], - recvEventData->peer_mac, - 6)); + NANOCLR_CHECK_HRESULT(CopyByteArrayToCLRArray( + dataRecvEvent + [Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_DataRecvEventInternal:: + FIELD__PeerMac], + recvEventData->peer_mac, + 6)); // clrRet.Data - NANOCLR_CHECK_HRESULT( - CopyByteArrayToCLRArray( - dataRecvEvent[Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_DataRecvEventInternal::FIELD__Data], - recvEventData->data, - recvEventData->dataLen)); + NANOCLR_CHECK_HRESULT(CopyByteArrayToCLRArray( + dataRecvEvent + [Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_DataRecvEventInternal:: + FIELD__Data], + recvEventData->data, + recvEventData->dataLen)); // clrRet.DataLen - dataRecvEvent[Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_DataRecvEventInternal::FIELD__DataLen].SetInteger(recvEventData->dataLen); + dataRecvEvent + [Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_DataRecvEventInternal:: + FIELD__DataLen] + .SetInteger(recvEventData->dataLen); DEBUG_FEXIT(); - NANOCLR_NOCLEANUP();} + NANOCLR_NOCLEANUP(); +} -HRESULT Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController__EspNowEventHandler:: - ProcessEvent___nanoFrameworkRuntimeEventsBaseEvent__U4__U4__SystemDateTime( CLR_RT_StackFrame &stack ) +HRESULT + Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardware_Esp32_EspNow_EspNowController__EspNowEventHandler:: + ProcessEvent___nanoFrameworkRuntimeEventsBaseEvent__U4__U4__SystemDateTime(CLR_RT_StackFrame &stack) { NANOCLR_HEADER(); @@ -134,7 +145,7 @@ HRESULT Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardwar DEBUG_WRITELINE("subevent: %d", subEvent); - switch(subEvent) + switch (subEvent) { case EVENT_ESP32_ESPNOW_DATASENT: hr = ProcessEvent_DataSent(stack); @@ -155,5 +166,3 @@ HRESULT Library_nanoFramework_hardware_esp32_espnow_native_nanoFramework_Hardwar NANOCLR_NOCLEANUP(); } - -