This commit is contained in:
Ken Van Hoeylandt 2024-01-02 17:21:56 +01:00
parent 1ca6c3ba28
commit e0fc80ca64
14 changed files with 29 additions and 45 deletions

View File

@ -31,7 +31,7 @@ IRAM_ATTR static bool prv_on_color_trans_done(esp_lcd_panel_io_handle_t io_handl
return (need_yield == pdTRUE);
}
static bool prv_create_display_device(DisplayDevice* display) {
static bool create_display_device(DisplayDevice* display) {
ESP_LOGI(TAG, "creating display");
gpio_config_t io_conf = {
@ -125,6 +125,6 @@ static bool prv_create_display_device(DisplayDevice* display) {
DisplayDriver board_2432s024_create_display_driver() {
return (DisplayDriver) {
.name = "ili9341_2432s024",
.create_display_device = &prv_create_display_device
.create_display_device = &create_display_device
};
}

View File

@ -9,7 +9,7 @@
#define TAG "2432s024_cst816"
static bool prv_create_touch_device(esp_lcd_panel_io_handle_t* io_handle, esp_lcd_touch_handle_t* touch_handle) {
static bool create_touch_device(esp_lcd_panel_io_handle_t* io_handle, esp_lcd_touch_handle_t* touch_handle) {
ESP_LOGI(TAG, "creating touch");
const i2c_config_t i2c_conf = {
@ -67,6 +67,6 @@ static bool prv_create_touch_device(esp_lcd_panel_io_handle_t* io_handle, esp_lc
TouchDriver board_2432s024_create_touch_driver() {
return (TouchDriver) {
.name = "cst816s_2432s024",
.create_touch_device = &prv_create_touch_device
.create_touch_device = &create_touch_device
};
}

View File

@ -2,8 +2,8 @@
#include "furi_core_defines.h"
#include "furi_hal_console.h"
#include <freertos/FreeRTOS.h>
#include <freertos/task.h>
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"
#include <stdlib.h>
static void __furi_put_uint32_as_text(uint32_t data) {

View File

@ -1,10 +1,10 @@
#include "critical.h"
#include "furi_core_defines.h"
#include <freertos/FreeRTOS.h>
#include <freertos/task.h>
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"
static portMUX_TYPE prv_critical_mutex;
static portMUX_TYPE critical_mutex;
__FuriCriticalInfo __furi_critical_enter(void) {
__FuriCriticalInfo info;
@ -16,7 +16,7 @@ __FuriCriticalInfo __furi_critical_enter(void) {
if (info.from_isr) {
info.isrm = taskENTER_CRITICAL_FROM_ISR();
} else if (info.kernel_running) {
taskENTER_CRITICAL(&prv_critical_mutex);
taskENTER_CRITICAL(&critical_mutex);
} else {
__disable_irq();
}
@ -28,7 +28,7 @@ void __furi_critical_exit(__FuriCriticalInfo info) {
if (info.from_isr) {
taskEXIT_CRITICAL_FROM_ISR(info.isrm);
} else if (info.kernel_running) {
taskEXIT_CRITICAL(&prv_critical_mutex);
taskEXIT_CRITICAL(&critical_mutex);
} else {
__enable_irq();
}

View File

@ -2,8 +2,8 @@
#include "check.h"
#include "furi_core_defines.h"
#include <freertos/FreeRTOS.h>
#include <freertos/event_groups.h>
#include "freertos/FreeRTOS.h"
#include "freertos/event_groups.h"
#define FURI_EVENT_FLAG_MAX_BITS_EVENT_GROUPS 24U
#define FURI_EVENT_FLAG_INVALID_BITS (~((1UL << FURI_EVENT_FLAG_MAX_BITS_EVENT_GROUPS) - 1U))

View File

@ -2,8 +2,8 @@
#include "app_manifest_registry.h"
#include <string.h>
#include <freertos/FreeRTOS.h>
#include <freertos/queue.h>
#include "freertos/FreeRTOS.h"
#include "freertos/queue.h"
void furi_init() {
furi_assert(!furi_kernel_is_irq());

View File

@ -3,8 +3,8 @@
#include "furi_core_defines.h"
#include "furi_core_types.h"
#include <freertos/FreeRTOS.h>
#include <freertos/task.h>
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"
#include <rom/ets_sys.h>
bool furi_kernel_is_irq() {

View File

@ -2,8 +2,8 @@
#include "check.h"
#include "kernel.h"
#include <freertos/FreeRTOS.h>
#include <freertos/queue.h>
#include "freertos/FreeRTOS.h"
#include "freertos/queue.h"
FuriMessageQueue* furi_message_queue_alloc(uint32_t msg_count, uint32_t msg_size) {
furi_assert((furi_kernel_is_irq() == 0U) && (msg_count > 0U) && (msg_size > 0U));

View File

@ -2,8 +2,8 @@
#include "check.h"
#include "furi_core_defines.h"
#include <freertos/FreeRTOS.h>
#include <freertos/semphr.h>
#include "freertos/FreeRTOS.h"
#include "freertos/semphr.h"
FuriMutex* furi_mutex_alloc(FuriMutexType type) {
furi_assert(!FURI_IS_IRQ_MODE());

View File

@ -2,8 +2,8 @@
#include "check.h"
#include "furi_core_defines.h"
#include <freertos/FreeRTOS.h>
#include <freertos/semphr.h>
#include "freertos/FreeRTOS.h"
#include "freertos/semphr.h"
FuriSemaphore* furi_semaphore_alloc(uint32_t max_count, uint32_t initial_count) {
furi_assert(!FURI_IS_IRQ_MODE());

View File

@ -3,8 +3,8 @@
#include "furi_core_defines.h"
#include "furi_core_types.h"
#include <freertos/FreeRTOS.h>
#include <freertos/stream_buffer.h>
#include "freertos/FreeRTOS.h"
#include "freertos/stream_buffer.h"
FuriStreamBuffer* furi_stream_buffer_alloc(size_t size, size_t trigger_level) {
furi_assert(size != 0);

View File

@ -8,8 +8,8 @@
#include <furi_hal_console.h>
#include <freertos/FreeRTOS.h>
#include <freertos/task.h>
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"
#define TAG "FuriThread"

View File

@ -2,8 +2,8 @@
#include "check.h"
#include "kernel.h"
#include <freertos/FreeRTOS.h>
#include <freertos/timers.h>
#include "freertos/FreeRTOS.h"
#include "freertos/timers.h"
typedef struct {
FuriTimerCallback func;

View File

@ -3,22 +3,6 @@
#include "thread.h"
#include "lvgl.h"
static void system_info_main(void* param) {
UNUSED(param);
printf(
"Heap memory available: %d / %d\n",
heap_caps_get_free_size(MALLOC_CAP_INTERNAL),
heap_caps_get_total_size(MALLOC_CAP_INTERNAL)
);
printf(
"SPI memory available: %d / %d\n",
heap_caps_get_free_size(MALLOC_CAP_SPIRAM),
heap_caps_get_total_size(MALLOC_CAP_SPIRAM)
);
}
static void app_show(lv_obj_t* parent, void* context) {
UNUSED(context);