Merge pull request #218 from bobbycar-graz/shit-fix

Shit config fix (indentations, other small changes)
This commit is contained in:
2022-01-03 21:26:40 +01:00
committed by GitHub
3 changed files with 18 additions and 36 deletions

View File

@@ -42,13 +42,6 @@ set(BOBBYCAR_BUILDFLAGS
-DDEFAULT_FIELDADVMAX=40 -DDEFAULT_FIELDADVMAX=40
-DFEATURE_WEBSERVER -DFEATURE_WEBSERVER
-DFEATURE_OTA -DFEATURE_OTA
# -DFEATURE_DPAD_5WIRESW
# -DPINS_DPAD_5WIRESW_OUT=4
# -DPINS_DPAD_5WIRESW_IN1=5
# -DPINS_DPAD_5WIRESW_IN2=27
# -DPINS_DPAD_5WIRESW_IN3=18
# -DPINS_DPAD_5WIRESW_IN4=19
# -DPINS_DPAD_EXTRASW_IN5=25
-DFEATURE_DPAD_6WIRESW -DFEATURE_DPAD_6WIRESW
-DPINS_DPAD_6WIRESW_OUT=4 -DPINS_DPAD_6WIRESW_OUT=4
-DPINS_DPAD_6WIRESW_IN1=5 -DPINS_DPAD_6WIRESW_IN1=5
@@ -66,7 +59,7 @@ set(BOBBYCAR_BUILDFLAGS
# -DPINS_GAMETRAKDIST=36 # -DPINS_GAMETRAKDIST=36
# -DFEATURE_POWERSUPPLY # -DFEATURE_POWERSUPPLY
# -DFEATURE_CLOUD # -DFEATURE_CLOUD
-DFEATURE_UDPCLOUD -DFEATURE_UDPCLOUD
-DFEATURE_LEDBACKLIGHT -DFEATURE_LEDBACKLIGHT
-DPINS_LEDBACKLIGHT=23 -DPINS_LEDBACKLIGHT=23
-DLEDBACKLIGHT_INVERTED -DLEDBACKLIGHT_INVERTED

View File

@@ -49,30 +49,32 @@ set(BOBBYCAR_BUILDFLAGS
-DPINS_DPAD_5WIRESW_IN2=5 -DPINS_DPAD_5WIRESW_IN2=5
-DPINS_DPAD_5WIRESW_IN3=27 -DPINS_DPAD_5WIRESW_IN3=27
-DFEATURE_BLE -DFEATURE_BLE
# -DFEATURE_BLUETOOTH # -DFEATURE_BLUETOOTH
# -DFEATURE_BMS # -DFEATURE_BMS
# -DFEATURE_GAMETRAK # -DFEATURE_GAMETRAK
# -DPINS_GAMETRAKX=34 # -DPINS_GAMETRAKX=34
# -DPINS_GAMETRAKY=39 # -DPINS_GAMETRAKY=39
# -DPINS_GAMETRAKDIST=36 # -DPINS_GAMETRAKDIST=36
# -DFEATURE_POWERSUPPLY # -DFEATURE_POWERSUPPLY
# -DFEATURE_CLOUD # -DFEATURE_CLOUD
-DFEATURE_UDPCLOUD -DFEATURE_UDPCLOUD
-DFEATURE_LEDBACKLIGHT -DFEATURE_LEDBACKLIGHT
-DPINS_LEDBACKLIGHT=23 -DPINS_LEDBACKLIGHT=23
-DLEDBACKLIGHT_INVERTED -DLEDBACKLIGHT_INVERTED
-DFEATURE_GARAGE -DFEATURE_GARAGE
#-DFEATURE_NTP # -DFEATURE_NTP
-DFEATURE_WIRELESS_CONFIG -DFEATURE_WIRELESS_CONFIG
-DFEATURE_LEDSTRIP -DFEATURE_LEDSTRIP
-DPINS_LEDSTRIP=33 -DPINS_LEDSTRIP=33
# -DLEDSTRIP_WRONG_DIRECTION # -DHEAP_LRGST_CRASH_TEXT_FIX
# -DLEDSTRIP_WRONG_DIRECTION
-DLEDSTRIP_ANIMATION_DEFAULT=2 -DLEDSTRIP_ANIMATION_DEFAULT=2
-DLEDS_PER_METER=144 -DLEDS_PER_METER=144
-DOLD_NVS -DOLD_NVS
-DFEATURE_DNS_NS -DFEATURE_DNS_NS
-DFEATURE_ESPNOW # -DSWITCH_BLINK
-DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET
-DFEATURE_ESPNOW
) )
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake") if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")

View File

@@ -880,16 +880,9 @@ CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
# #
# Core dump # Core dump
# #
CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH=y # CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH is not set
# CONFIG_ESP_COREDUMP_ENABLE_TO_UART is not set # CONFIG_ESP_COREDUMP_ENABLE_TO_UART is not set
# CONFIG_ESP_COREDUMP_ENABLE_TO_NONE is not set CONFIG_ESP_COREDUMP_ENABLE_TO_NONE=y
# CONFIG_ESP_COREDUMP_DATA_FORMAT_BIN is not set
CONFIG_ESP_COREDUMP_DATA_FORMAT_ELF=y
# CONFIG_ESP_COREDUMP_CHECKSUM_CRC32 is not set
CONFIG_ESP_COREDUMP_CHECKSUM_SHA256=y
CONFIG_ESP_COREDUMP_CHECK_BOOT=y
CONFIG_ESP_COREDUMP_ENABLE=y
CONFIG_ESP_COREDUMP_MAX_TASKS_NUM=64
# end of Core dump # end of Core dump
# #
@@ -1685,15 +1678,9 @@ CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1=y
CONFIG_IPC_TASK_STACK_SIZE=1024 CONFIG_IPC_TASK_STACK_SIZE=1024
CONFIG_TIMER_TASK_STACK_SIZE=3584 CONFIG_TIMER_TASK_STACK_SIZE=3584
CONFIG_SW_COEXIST_ENABLE=y CONFIG_SW_COEXIST_ENABLE=y
CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH=y # CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set
# CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set # CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set
# CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE is not set CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y
# CONFIG_ESP32_COREDUMP_DATA_FORMAT_BIN is not set
CONFIG_ESP32_COREDUMP_DATA_FORMAT_ELF=y
# CONFIG_ESP32_COREDUMP_CHECKSUM_CRC32 is not set
CONFIG_ESP32_COREDUMP_CHECKSUM_SHA256=y
CONFIG_ESP32_ENABLE_COREDUMP=y
CONFIG_ESP32_CORE_DUMP_MAX_TASKS_NUM=64
CONFIG_MB_MASTER_TIMEOUT_MS_RESPOND=150 CONFIG_MB_MASTER_TIMEOUT_MS_RESPOND=150
CONFIG_MB_MASTER_DELAY_MS_CONVERT=200 CONFIG_MB_MASTER_DELAY_MS_CONVERT=200
CONFIG_MB_QUEUE_LENGTH=20 CONFIG_MB_QUEUE_LENGTH=20