Skip to content

Commit 7bb7962

Browse files
removing bluetooth setup from main entrypoint
1 parent 2085aeb commit 7bb7962

File tree

1 file changed

+8
-43
lines changed

1 file changed

+8
-43
lines changed

main/sketch.ino.cpp

Lines changed: 8 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ void setDebug(int d) {
9191
}
9292

9393
void setupWiFi();
94-
void setupBluetooth();
9594

9695
void setup() {
9796
setDebug(debug);
@@ -107,50 +106,11 @@ void setup() {
107106
digitalWrite(27, HIGH);
108107
#endif
109108

110-
pinMode(5, INPUT);
111-
if (digitalRead(5) == LOW) {
112-
setupBluetooth();
113-
} else {
114-
setupWiFi();
115-
}
109+
setupWiFi();
116110
}
117111

118112
// #define UNO_WIFI_REV2
119113

120-
void setupBluetooth() {
121-
periph_module_enable(PERIPH_UART1_MODULE);
122-
periph_module_enable(PERIPH_UHCI0_MODULE);
123-
124-
#if defined(UNO_WIFI_REV2)
125-
uart_set_pin(UART_NUM_1, 1, 3, 33, 0); // TX, RX, RTS, CTS
126-
#elif defined(NANO_RP2040_CONNECT)
127-
uart_set_pin(UART_NUM_1, 1, 3, 33, 12); // TX, RX, RTS, CTS
128-
#else
129-
uart_set_pin(UART_NUM_1, 23, 12, 18, 5);
130-
#endif
131-
uart_set_hw_flow_ctrl(UART_NUM_1, UART_HW_FLOWCTRL_CTS_RTS, 5);
132-
133-
esp_bt_controller_config_t btControllerConfig = BT_CONTROLLER_INIT_CONFIG_DEFAULT();
134-
135-
btControllerConfig.hci_uart_no = UART_NUM_1;
136-
#if defined(UNO_WIFI_REV2) || defined(NANO_RP2040_CONNECT)
137-
btControllerConfig.hci_uart_baudrate = 115200;
138-
#else
139-
btControllerConfig.hci_uart_baudrate = 912600;
140-
#endif
141-
142-
esp_bt_controller_init(&btControllerConfig);
143-
while (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_IDLE);
144-
esp_bt_controller_enable(ESP_BT_MODE_BLE);
145-
esp_bt_sleep_enable();
146-
147-
vTaskSuspend(NULL);
148-
149-
while (1) {
150-
vTaskDelay(portMAX_DELAY);
151-
}
152-
}
153-
154114
unsigned long getTime() {
155115
int ret = 0;
156116
do {
@@ -160,7 +120,12 @@ unsigned long getTime() {
160120
}
161121

162122
void setupWiFi() {
163-
esp_bt_controller_mem_release(ESP_BT_MODE_BTDM);
123+
esp_err_t ret = ESP_OK;
124+
125+
if((ret = esp_bt_controller_mem_release(ESP_BT_MODE_CLASSIC_BT)) != ESP_OK) {
126+
ets_printf("failed esp_bt_controller_mem_release %s\n", esp_err_to_name(ret));
127+
}
128+
164129
SPIS.begin();
165130

166131
esp_vfs_spiffs_conf_t conf = {
@@ -170,7 +135,7 @@ void setupWiFi() {
170135
.format_if_mount_failed = true
171136
};
172137

173-
esp_err_t ret = esp_vfs_spiffs_register(&conf);
138+
ret = esp_vfs_spiffs_register(&conf);
174139

175140
if (WiFi.status() == WL_NO_SHIELD) {
176141
while (1); // no shield

0 commit comments

Comments
 (0)