Clang format changes for more readability
This commit is contained in:
@@ -22,7 +22,8 @@
|
||||
|
||||
internal constexpr bool kBlockUntilEthernetEstablished = false;
|
||||
|
||||
extern "C" void app_main() {
|
||||
extern "C" void app_main()
|
||||
{
|
||||
printf("Hello, Worldi!\n");
|
||||
|
||||
httpd_handle_t web_server = NULL;
|
||||
@@ -35,25 +36,30 @@ extern "C" void app_main() {
|
||||
set_led_status(led_status::ConnectingEthernet);
|
||||
g_Ethernet_Initialized = true;
|
||||
esp_err_t result = connect_ethernet(kBlockUntilEthernetEstablished);
|
||||
if (result != ESP_OK) {
|
||||
if (result != ESP_OK)
|
||||
{
|
||||
set_led_status(led_status::Failed);
|
||||
vTaskDelay(pdMS_TO_TICKS(1000));
|
||||
goto shutdown;
|
||||
}
|
||||
|
||||
// Check for ethernet connection until its made
|
||||
if (!kBlockUntilEthernetEstablished) {
|
||||
if (!kBlockUntilEthernetEstablished)
|
||||
{
|
||||
uint8 retries = 1;
|
||||
do {
|
||||
do
|
||||
{
|
||||
set_led_status(led_status::ConnectingEthernet);
|
||||
result = check_ethernet_connection(retries);
|
||||
|
||||
if (result == ESP_ERR_INVALID_STATE) {
|
||||
if (result == ESP_ERR_INVALID_STATE)
|
||||
{
|
||||
printf("Ethernet cable not plugged in, skipping retries.\n");
|
||||
break;
|
||||
}
|
||||
|
||||
if (result != ESP_OK) {
|
||||
if (result != ESP_OK)
|
||||
{
|
||||
set_led_status(led_status::Failed);
|
||||
vTaskDelay(pdMS_TO_TICKS(1000));
|
||||
}
|
||||
@@ -63,7 +69,8 @@ extern "C" void app_main() {
|
||||
retries <= CONFIG_CALENDINK_ETH_RETRIES);
|
||||
}
|
||||
|
||||
if (result != ESP_OK) {
|
||||
if (result != ESP_OK)
|
||||
{
|
||||
printf("Ethernet failed, trying wifi\n");
|
||||
disconnect_ethernet();
|
||||
g_Ethernet_Initialized = false;
|
||||
@@ -73,19 +80,23 @@ extern "C" void app_main() {
|
||||
result =
|
||||
connect_wifi(CONFIG_CALENDINK_WIFI_SSID, CONFIG_CALENDINK_WIFI_PASSWORD,
|
||||
kBlockUntilEthernetEstablished);
|
||||
if (result != ESP_OK) {
|
||||
if (result != ESP_OK)
|
||||
{
|
||||
set_led_status(led_status::Failed);
|
||||
vTaskDelay(pdMS_TO_TICKS(1000));
|
||||
goto shutdown;
|
||||
}
|
||||
|
||||
if (!kBlockUntilEthernetEstablished) {
|
||||
if (!kBlockUntilEthernetEstablished)
|
||||
{
|
||||
uint8 retries = 1;
|
||||
do {
|
||||
do
|
||||
{
|
||||
set_led_status(led_status::ConnectingWifi);
|
||||
result = check_wifi_connection(retries);
|
||||
|
||||
if (result != ESP_OK) {
|
||||
if (result != ESP_OK)
|
||||
{
|
||||
set_led_status(led_status::Failed);
|
||||
vTaskDelay(pdMS_TO_TICKS(1000));
|
||||
}
|
||||
@@ -95,14 +106,17 @@ extern "C" void app_main() {
|
||||
retries <= CONFIG_CALENDINK_WIFI_RETRIES);
|
||||
}
|
||||
|
||||
if (result != ESP_OK) {
|
||||
if (result != ESP_OK)
|
||||
{
|
||||
printf("Wifi failed.\n");
|
||||
goto shutdown;
|
||||
}
|
||||
|
||||
set_led_status(led_status::ReadyWifi);
|
||||
printf("Will use Wifi!\n");
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
set_led_status(led_status::ReadyEthernet);
|
||||
printf("Will use Ethernet!\n");
|
||||
}
|
||||
@@ -113,23 +127,27 @@ extern "C" void app_main() {
|
||||
web_server = start_webserver();
|
||||
|
||||
// Keep the main task alive indefinitely
|
||||
while (true) {
|
||||
while (true)
|
||||
{
|
||||
vTaskDelay(pdMS_TO_TICKS(1000));
|
||||
}
|
||||
|
||||
shutdown:
|
||||
printf("Shutting down.\n");
|
||||
|
||||
if (web_server) {
|
||||
if (web_server)
|
||||
{
|
||||
stop_webserver(web_server);
|
||||
web_server = NULL;
|
||||
}
|
||||
|
||||
if (g_Ethernet_Initialized) {
|
||||
if (g_Ethernet_Initialized)
|
||||
{
|
||||
disconnect_ethernet();
|
||||
g_Ethernet_Initialized = false;
|
||||
}
|
||||
if (g_Wifi_Initialized) {
|
||||
if (g_Wifi_Initialized)
|
||||
{
|
||||
disconnect_wifi();
|
||||
g_Wifi_Initialized = false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user