From 67c06ca4d94d3a45a82fbcb6b8480c2304baa393 Mon Sep 17 00:00:00 2001 From: adriansoundy Date: Wed, 14 Feb 2018 00:20:14 +1300 Subject: [PATCH] Fix issues that stopped ESP32 build after change to events Commented out CPU_Sleep from nanoHALV2.h for now as compile giving error that uint64_t is not defined. Can't find out why for moment. But doesn't seem to need it as also defined in TargetHal_power.h. Both arm and esp32 build ok without it. --- src/HAL/Include/nanoHAL_v2.h | 2 +- targets/FreeRTOS/ESP32_DevKitC/Include/targetHAL.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/HAL/Include/nanoHAL_v2.h b/src/HAL/Include/nanoHAL_v2.h index 4564c5984c..16c6ca9c71 100644 --- a/src/HAL/Include/nanoHAL_v2.h +++ b/src/HAL/Include/nanoHAL_v2.h @@ -164,7 +164,7 @@ extern "C" { #endif void CPU_Reset(); -void CPU_Sleep(SLEEP_LEVEL_type level, uint64_t wakeEvents); +//void CPU_Sleep(SLEEP_LEVEL_type level, uint64_t wakeEvents); #ifdef __cplusplus } diff --git a/targets/FreeRTOS/ESP32_DevKitC/Include/targetHAL.h b/targets/FreeRTOS/ESP32_DevKitC/Include/targetHAL.h index cb50c81263..681ca55db6 100644 --- a/targets/FreeRTOS/ESP32_DevKitC/Include/targetHAL.h +++ b/targets/FreeRTOS/ESP32_DevKitC/Include/targetHAL.h @@ -19,7 +19,7 @@ // these macros are to be used at entry/exit of native interrupt handlers #define NATIVE_INTERRUPT_START SystemState_SetNoLock( SYSTEM_STATE_ISR ); \ SystemState_SetNoLock( SYSTEM_STATE_NO_CONTINUATIONS ); -#define NATIVEINTERRUPT_END SystemState_ClearNoLock( SYSTEM_STATE_NO_CONTINUATIONS ); \ +#define NATIVE_INTERRUPT_END SystemState_ClearNoLock( SYSTEM_STATE_NO_CONTINUATIONS ); \ SystemState_ClearNoLock( SYSTEM_STATE_ISR );