mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-17 23:37:44 +00:00
beb268ff25
I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
47 lines
1.0 KiB
C
47 lines
1.0 KiB
C
#pragma once
|
|
|
|
// The FreeRTOS includes are in a different directory on ESP32 and I can't figure out how to make that work with platformio gcc
|
|
// options so this is my quick hack to make things work
|
|
|
|
#if defined(ARDUINO_ARCH_ESP32)
|
|
#define HAS_FREE_RTOS
|
|
|
|
#include <freertos/FreeRTOS.h>
|
|
#include <freertos/queue.h>
|
|
#include <freertos/semphr.h>
|
|
#include <freertos/task.h>
|
|
#endif
|
|
|
|
#if defined(ARDUINO_NRF52_ADAFRUIT) || defined(ARDUINO_ARCH_RP2040)
|
|
#define HAS_FREE_RTOS
|
|
|
|
#include <FreeRTOS.h>
|
|
#include <queue.h>
|
|
#include <semphr.h>
|
|
#include <task.h>
|
|
#endif
|
|
|
|
#ifdef HAS_FREE_RTOS
|
|
|
|
// Include real FreeRTOS defs above
|
|
|
|
#else
|
|
|
|
// Include placeholder fake FreeRTOS defs
|
|
|
|
#include <Arduino.h>
|
|
|
|
typedef uint32_t TickType_t;
|
|
typedef uint32_t BaseType_t;
|
|
|
|
#define portMAX_DELAY UINT32_MAX
|
|
|
|
#define tskIDLE_PRIORITY 0
|
|
#define configMAX_PRIORITIES 10 // Highest priority level
|
|
|
|
// Don't do anything on non free rtos platforms when done with the ISR
|
|
#define portYIELD_FROM_ISR(x)
|
|
|
|
enum eNotifyAction { eNoAction, eSetValueWithoutOverwrite, eSetValueWithOverwrite };
|
|
|
|
#endif |