cleanup

fabiankuffer · fabiankuffer · commit 37ca6a3851e8 · 2022-12-31T11:43:25.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-build/
+build/
+sdkconfig
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,4 +3,4 @@
 cmake_minimum_required(VERSION 3.5)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-project(blehr)
+project(simlinkModule)
diff --git a/Makefile b/Makefile
@@ -3,6 +3,6 @@
 # project subdirectory.
 #
 
-PROJECT_NAME := blehr
+PROJECT_NAME := simlinkModule
 
 include $(IDF_PATH)/make/project.mk
diff --git a/README.md b/README.md
@@ -1 +1 @@
-# Main ESP32 Code
+# SimLinkModule-Software
diff --git a/components/ble/CMakeLists.txt b/components/ble/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(srcs "gap.c" "gatt.c" "ble.c")
+
+idf_component_register(SRCS "${srcs}"
+                    INCLUDE_DIRS "include"
+                    REQUIRES bt)
diff --git a/components/ble/ble.c b/components/ble/ble.c
@@ -0,0 +1 @@
+#include "ble.h"
diff --git a/components/ble/gap.c b/components/ble/gap.c
@@ -0,0 +1 @@
+#include "gap.h"
diff --git a/components/ble/gatt.c b/components/ble/gatt.c
@@ -0,0 +1 @@
+#include "gatt.h"
diff --git a/components/ble/include/ble.h b/components/ble/include/ble.h
@@ -0,0 +1,6 @@
+#ifndef BLE_H
+#define BLE_H
+
+#include "esp_log.h"
+
+#endif
diff --git a/components/ble/include/gap.h b/components/ble/include/gap.h
@@ -0,0 +1,6 @@
+#ifndef GAP_H
+#define GAP_H
+
+#include "esp_log.h"
+
+#endif
diff --git a/components/ble/include/gatt.h b/components/ble/include/gatt.h
@@ -0,0 +1,6 @@
+#ifndef GATT_H
+#define GATT_H
+
+#include "esp_log.h"
+
+#endif
diff --git a/main/main.c b/main/main.c
@@ -470,18 +470,25 @@ void app_main(void)
     rc = ble_svc_gap_device_name_set(CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME);
     assert(rc == 0);
 
-    /* Start the task */
-    nimble_port_freertos_init(blehr_host_task);
-
+    //init i2c for the oled display
     I2C_master_init();
     ssd1306_init();
 
-    ssd1306_setString("reset?",0,0);
-    ssd1306_setString("si",0,18);
-    ssd1306_setString("no",128-22,18);
+    //init uart for crsf
+    initCRSF_read();
+
+    //welcome screen
+    ssd1306_setString("Welcome",25,9);
     ssd1306_display();
 
+    //display screen one second before starting up ble and crsf read
+    vTaskDelay(1000 / portTICK_PERIOD_MS);
+    ssd1306_clear();
+    ssd1306_display();
 
-    initCRSF_read();
+    /* Start ble task */
+    nimble_port_freertos_init(blehr_host_task);
+
+    //task to read crsf uart ata
     xTaskCreate(crsf_get_ChannelData_task, "crsf_task", 2048, NULL, 10, NULL);
 }
diff --git a/sdkconfig.ci b/sdkconfig.ci
diff --git a/sdkconfig.defaults b/sdkconfig.defaults
@@ -5,8 +5,173 @@
 # BT config
 #
 CONFIG_BT_ENABLED=y
+
+#
+# Bluetooth controller
+#
 CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
-CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n
-CONFIG_BTDM_CTRL_MODE_BTDM=n
-CONFIG_BT_BLUEDROID_ENABLED=n
+# CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY is not set
+# CONFIG_BTDM_CTRL_MODE_BTDM is not set
+CONFIG_BTDM_CTRL_BLE_MAX_CONN=3
+CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
+CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
+CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
+CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=3
+CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=0
+CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0
+CONFIG_BTDM_CTRL_PINNED_TO_CORE_0=y
+# CONFIG_BTDM_CTRL_PINNED_TO_CORE_1 is not set
+CONFIG_BTDM_CTRL_PINNED_TO_CORE=0
+CONFIG_BTDM_CTRL_HCI_MODE_VHCI=y
+# CONFIG_BTDM_CTRL_HCI_MODE_UART_H4 is not set
+
+#
+# MODEM SLEEP Options
+#
+CONFIG_BTDM_CTRL_MODEM_SLEEP=y
+CONFIG_BTDM_CTRL_MODEM_SLEEP_MODE_ORIG=y
+# CONFIG_BTDM_CTRL_MODEM_SLEEP_MODE_EVED is not set
+CONFIG_BTDM_CTRL_LPCLK_SEL_MAIN_XTAL=y
+# end of MODEM SLEEP Options
+
+CONFIG_BTDM_BLE_DEFAULT_SCA_250PPM=y
+CONFIG_BTDM_BLE_SLEEP_CLOCK_ACCURACY_INDEX_EFF=1
+CONFIG_BTDM_BLE_SCAN_DUPL=y
+CONFIG_BTDM_SCAN_DUPL_TYPE_DEVICE=y
+# CONFIG_BTDM_SCAN_DUPL_TYPE_DATA is not set
+# CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE is not set
+CONFIG_BTDM_SCAN_DUPL_TYPE=0
+CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=200
+# CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN is not set
+CONFIG_BTDM_CTRL_FULL_SCAN_SUPPORTED=y
+CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
+CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
+CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
+CONFIG_BTDM_RESERVE_DRAM=0xdb5c
+CONFIG_BTDM_CTRL_HLI=y
+# end of Bluetooth controller
+
+# CONFIG_BT_BLUEDROID_ENABLED is not set
 CONFIG_BT_NIMBLE_ENABLED=y
+# CONFIG_BT_CONTROLLER_ONLY is not set
+
+#
+# NimBLE Options
+#
+CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL=y
+# CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_DEFAULT is not set
+# CONFIG_BT_NIMBLE_LOG_LEVEL_NONE is not set
+# CONFIG_BT_NIMBLE_LOG_LEVEL_ERROR is not set
+# CONFIG_BT_NIMBLE_LOG_LEVEL_WARNING is not set
+# CONFIG_BT_NIMBLE_LOG_LEVEL_INFO is not set
+CONFIG_BT_NIMBLE_LOG_LEVEL_DEBUG=y
+CONFIG_BT_NIMBLE_LOG_LEVEL=0
+CONFIG_BT_NIMBLE_MAX_CONNECTIONS=3
+CONFIG_BT_NIMBLE_MAX_BONDS=3
+CONFIG_BT_NIMBLE_MAX_CCCDS=256
+CONFIG_BT_NIMBLE_L2CAP_COC_MAX_NUM=0
+CONFIG_BT_NIMBLE_PINNED_TO_CORE_0=y
+# CONFIG_BT_NIMBLE_PINNED_TO_CORE_1 is not set
+CONFIG_BT_NIMBLE_PINNED_TO_CORE=0
+CONFIG_BT_NIMBLE_TASK_STACK_SIZE=4096
+CONFIG_BT_NIMBLE_ROLE_CENTRAL=y
+CONFIG_BT_NIMBLE_ROLE_PERIPHERAL=y
+CONFIG_BT_NIMBLE_ROLE_BROADCASTER=y
+CONFIG_BT_NIMBLE_ROLE_OBSERVER=y
+CONFIG_BT_NIMBLE_NVS_PERSIST=y
+CONFIG_BT_NIMBLE_SM_LEGACY=y
+CONFIG_BT_NIMBLE_SM_SC=y
+# CONFIG_BT_NIMBLE_DEBUG is not set
+# CONFIG_BT_NIMBLE_SM_SC_DEBUG_KEYS is not set
+CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="SimlinkModule"
+CONFIG_BT_NIMBLE_GAP_DEVICE_NAME_MAX_LEN=31
+CONFIG_BT_NIMBLE_ATT_PREFERRED_MTU=256
+CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE=0
+CONFIG_BT_NIMBLE_ACL_BUF_COUNT=20
+CONFIG_BT_NIMBLE_ACL_BUF_SIZE=255
+CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70
+CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=30
+CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=8
+CONFIG_BT_NIMBLE_MSYS1_BLOCK_COUNT=12
+CONFIG_BT_NIMBLE_HS_FLOW_CTRL=y
+CONFIG_BT_NIMBLE_HS_FLOW_CTRL_ITVL=1000
+CONFIG_BT_NIMBLE_HS_FLOW_CTRL_THRESH=2
+CONFIG_BT_NIMBLE_HS_FLOW_CTRL_TX_ON_DISCONNECT=y
+CONFIG_BT_NIMBLE_RPA_TIMEOUT=900
+# CONFIG_BT_NIMBLE_MESH is not set
+CONFIG_BT_NIMBLE_CRYPTO_STACK_MBEDTLS=y
+CONFIG_BT_NIMBLE_HS_STOP_TIMEOUT_MS=2000
+# CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT is not set
+# CONFIG_BT_NIMBLE_BLUFI_ENABLE is not set
+CONFIG_BT_NIMBLE_USE_ESP_TIMER=y
+# end of NimBLE Options
+
+CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5=y
+CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE=y
+
+CONFIG_MBEDTLS_ECDH_LEGACY_CONTEXT=y
+CONFIG_MBEDTLS_ECP_RESTARTABLE=y
+CONFIG_MBEDTLS_CMAC_C=y
+
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+# CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY is not set
+# CONFIG_BTDM_CONTROLLER_MODE_BTDM is not set
+CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN=3
+CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=3
+CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=0
+CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0
+CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0
+CONFIG_BTDM_CONTROLLER_HCI_MODE_VHCI=y
+# CONFIG_BTDM_CONTROLLER_HCI_MODE_UART_H4 is not set
+CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=y
+CONFIG_BLE_SCAN_DUPLICATE=y
+CONFIG_SCAN_DUPLICATE_BY_DEVICE_ADDR=y
+# CONFIG_SCAN_DUPLICATE_BY_ADV_DATA is not set
+# CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR is not set
+CONFIG_SCAN_DUPLICATE_TYPE=0
+CONFIG_DUPLICATE_SCAN_CACHE_SIZE=200
+# CONFIG_BLE_MESH_SCAN_DUPLICATE_EN is not set
+CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED=y
+CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED=y
+CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_NUM=100
+CONFIG_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
+# CONFIG_BLUEDROID_ENABLED is not set
+CONFIG_NIMBLE_ENABLED=y
+CONFIG_NIMBLE_MEM_ALLOC_MODE_INTERNAL=y
+# CONFIG_NIMBLE_MEM_ALLOC_MODE_DEFAULT is not set
+CONFIG_NIMBLE_MAX_CONNECTIONS=3
+CONFIG_NIMBLE_MAX_BONDS=3
+CONFIG_NIMBLE_MAX_CCCDS=256
+CONFIG_NIMBLE_L2CAP_COC_MAX_NUM=0
+CONFIG_NIMBLE_PINNED_TO_CORE_0=y
+# CONFIG_NIMBLE_PINNED_TO_CORE_1 is not set
+CONFIG_NIMBLE_PINNED_TO_CORE=0
+CONFIG_NIMBLE_TASK_STACK_SIZE=4096
+CONFIG_NIMBLE_ROLE_CENTRAL=y
+CONFIG_NIMBLE_ROLE_PERIPHERAL=y
+CONFIG_NIMBLE_ROLE_BROADCASTER=y
+CONFIG_NIMBLE_ROLE_OBSERVER=y
+CONFIG_NIMBLE_NVS_PERSIST=y
+CONFIG_NIMBLE_SM_LEGACY=y
+CONFIG_NIMBLE_SM_SC=y
+# CONFIG_NIMBLE_DEBUG is not set
+# CONFIG_NIMBLE_SM_SC_DEBUG_KEYS is not set
+CONFIG_NIMBLE_SVC_GAP_DEVICE_NAME="SimlinkModule"
+CONFIG_NIMBLE_GAP_DEVICE_NAME_MAX_LEN=31
+CONFIG_NIMBLE_ATT_PREFERRED_MTU=256
+CONFIG_NIMBLE_SVC_GAP_APPEARANCE=0
+CONFIG_NIMBLE_ACL_BUF_COUNT=20
+CONFIG_NIMBLE_ACL_BUF_SIZE=255
+CONFIG_NIMBLE_HCI_EVT_BUF_SIZE=70
+CONFIG_NIMBLE_HCI_EVT_HI_BUF_COUNT=30
+CONFIG_NIMBLE_HCI_EVT_LO_BUF_COUNT=8
+CONFIG_NIMBLE_MSYS1_BLOCK_COUNT=12
+CONFIG_NIMBLE_HS_FLOW_CTRL=y
+CONFIG_NIMBLE_HS_FLOW_CTRL_ITVL=1000
+CONFIG_NIMBLE_HS_FLOW_CTRL_THRESH=2
+CONFIG_NIMBLE_HS_FLOW_CTRL_TX_ON_DISCONNECT=y
+CONFIG_NIMBLE_RPA_TIMEOUT=900
+# CONFIG_NIMBLE_MESH is not set
+CONFIG_NIMBLE_CRYPTO_STACK_MBEDTLS=y
+
+CONFIG_SW_COEXIST_ENABLE=y
diff --git a/sdkconfig.old b/sdkconfig.old

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`# project subdirectory.`
`4`	`4`	`#`
`5`	`5`
`6`		`-PROJECT_NAME := blehr`
	`6`	`+PROJECT_NAME := simlinkModule`
`7`	`7`
`8`	`8`	`include $(IDF_PATH)/make/project.mk`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-# Main ESP32 Code`
	`1`	`+# SimLinkModule-Software`