Skip to content

Commit dd6b9bf

Browse files
committed
esp32-c3 beetle env config. conditional pcd compilation
removed blinker test code
1 parent 8dc1859 commit dd6b9bf

File tree

10 files changed

+21
-47
lines changed

10 files changed

+21
-47
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ sdkconfig.old
66
.vscode/c_cpp_properties.json
77
.vscode/launch.json
88
sdkconfig.esp32dev
9+
sdkconfig.dfrobot_beetle_esp32c3.old
10+
sdkconfig.dfrobot_beetle_esp32c3

main/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ idf_component_register(
22
SRCS
33
"main.c"
44
"wifi.c"
5-
"Tasks/core/blinker.task.c"
65
"Tasks/core/calcRideParamsOnISR.task.c"
76
"Tasks/core/rideStatusWatchdog.task.c"
87
"Tasks/storage/spiffs_main.c"

main/Tasks/core/blinker.task.c

Lines changed: 0 additions & 28 deletions
This file was deleted.

main/Tasks/core/blinker.task.h

Lines changed: 0 additions & 7 deletions
This file was deleted.

main/Tasks/screen_pcd8544/pcd8544_font16x24.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#ifndef NO_SCREEN
12
#include "pcd8544_font16x24.h"
23

34
uint8_t fontDetermination[11][CHAR_SIZE] = {
@@ -518,3 +519,4 @@ uint8_t fontDetermination[11][CHAR_SIZE] = {
518519

519520
}};
520521

522+
#endif

main/Tasks/screen_pcd8544/pcd8544_font_utils.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#ifndef NO_SCREEN
12
#include <pcd8544_font_utils.h>
23

34
#include "esp_log.h"
@@ -67,4 +68,6 @@ void vGetDistanceChars(uint8_t *charArr[6], float *distance, uint8_t *bigCharPos
6768
snprintf(buffer, 10, "%d.%d", distanceInt, fraction);
6869
}
6970
fillCharsFromBuffer(charArr, buffer, 10, bigCharPositions);
70-
}
71+
}
72+
73+
#endif // NO_SCREEN

main/Tasks/screen_pcd8544/screen_pcd8544.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#ifndef NO_SCREEN
12
#include "screen_pcd8544.h"
23

34
#include <sys/time.h>
@@ -280,4 +281,5 @@ void vInitPcd8544Screen() {
280281
pcd8544_sync_and_gc();
281282

282283
xTaskCreate(&vScreenRefreshTask, "vScreenRefreshTask", 4096, NULL, 2, NULL);
283-
}
284+
}
285+
#endif

main/main.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1+
#ifdef NO_SCREEN
2+
#include "Tasks/screen_pcd8544/screen_pcd8544.h"
3+
#include "driver/spi_common.h"
4+
#endif
5+
16
#include <stdio.h>
27
#include <stdlib.h>
38

4-
#include "Tasks/core/blinker.task.h"
59
#include "Tasks/core/calcRideParamsOnISR.task.h"
610
#include "Tasks/core/rideStatusWatchdog.task.h"
7-
#include "Tasks/screen_pcd8544/screen_pcd8544.h"
811
#include "Tasks/storage/spiffs_main.h"
912
#include "Tasks/sync/obc_rest.task.h"
1013
#include "Tasks/sync/sntp.task.h"
1114
#include "driver/gpio.h"
12-
#include "driver/spi_common.h"
1315
#include "esp_event_base.h"
1416
#include "esp_log.h"
1517
#include "esp_system.h"
@@ -59,7 +61,6 @@ static void IRAM_ATTR vReedISR(void* arg) {
5961

6062
void vInitTasks() {
6163
xTaskCreate(&vCalcRideParamsOnISRTask, "vCalcRideParamsOnISRTask", 2048, NULL, 6, NULL);
62-
xTaskCreate(&vBlinkerTask, "vBlinkerTask", 2048, NULL, 5, NULL);
6364
xTaskCreate(&vRideStatusWatchdogTask, "vRideStatusIntervalCheckTask", 2048, NULL, 3, NULL);
6465
xTaskCreate(&vSntpSyncTask, "vSntpSyncTask", 4096, NULL, 3, NULL);
6566
vRegisterServerSyncTask();
@@ -105,9 +106,11 @@ void app_main() {
105106

106107
vInitNVS();
107108
vInitSpiffs();
108-
vInitPcd8544Screen();
109109
vAttachInterrupts();
110110
vInitTasks();
111+
#ifndef NO_SCREEN
112+
vInitPcd8544Screen();
113+
#endif
111114

112115
ESP_ERROR_CHECK(esp_event_handler_register_with(obc_events_loop, OBC_EVENTS, ESP_EVENT_ANY_ID, testHandler, obc_events_loop));
113116
ESP_LOGI(TAG, "Startup complete");

main/settings.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
#define OBC_SERVER_SYNC_MIN_DIST 0.1
1212

1313
#define ESP_INTR_FLAG_DEFAULT 0
14-
#define BLINK_GPIO 2
1514
#define REED_IO_NUM 21
1615

1716
#endif
18-
19-

platformio.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,5 @@ monitor_speed = 115200
2828
monitor_filters = esp32_exception_decoder
2929
board_build.partitions = partition_table.csv
3030
debug_tool = esp-prog
31-
debug_init_break = tbreak setup
31+
debug_init_break = tbreak setup
32+
build_flags = -D NO_SCREEN

0 commit comments

Comments
 (0)