forked from open-dynamic-robot-initiative/master-board
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request open-dynamic-robot-initiative#16 from AlexisPotier…
…/wifi_eth_autoselect Autoselection between wifi and ethernet
- Loading branch information
Showing
7 changed files
with
713 additions
and
78 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,61 +1,93 @@ | ||
| #include "direct_wifi.h" | ||
|
|
||
| static const char* WIFI_TAG = "Direct_Wifi"; | ||
| static const char *WIFI_TAG = "Direct_Wifi"; | ||
|
|
||
| void (*wifi_recv_cb)(uint8_t src_mac[6], uint8_t *data, int len, char eth_or_wifi) = NULL; // eth_or_wifi = 'e' when eth is used, 'w' when wifi is used | ||
|
|
||
| esp_now_peer_info_t peer; | ||
| static uint8_t s_example_broadcast_mac[ESP_NOW_ETH_ALEN] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; | ||
|
|
||
| void wifi_send_data(uint8_t *data, int len) | ||
| { | ||
| esp_now_send(peer.peer_addr, data, len); | ||
| } | ||
|
|
||
| void wifi_send_data(uint8_t *data, int len) { | ||
| esp_now_send(peer.peer_addr, data, len); | ||
| static void wifi_recv_func(uint8_t src_mac[6], uint8_t *data, int len) | ||
| { | ||
| if (wifi_recv_cb == NULL) | ||
| { | ||
| ESP_LOGW(WIFI_TAG, "Wifi frame received but no callback function is set on received..."); | ||
| } | ||
| else | ||
| { | ||
| wifi_recv_cb(src_mac, data, len, 'w'); | ||
| } | ||
| } | ||
|
|
||
| static void wifi_send_cb(const uint8_t *mac_addr, esp_now_send_status_t status) | ||
| { | ||
| if(status != ESP_OK) { | ||
| if (status != ESP_OK) | ||
| { | ||
| //error_send++; | ||
| } | ||
| } | ||
|
|
||
| void wifi_attach_recv_cb(void (*cb)(uint8_t src_mac[6], uint8_t *data, int len)) { | ||
| ESP_ERROR_CHECK( esp_now_register_recv_cb(cb) ); | ||
| void wifi_attach_recv_cb(void (*cb)(uint8_t src_mac[6], uint8_t *data, int len, char eth_or_wifi)) | ||
| { | ||
| wifi_recv_cb = cb; | ||
| } | ||
|
|
||
| void wifi_detach_recv_cb() { | ||
| esp_now_unregister_recv_cb(); | ||
| void wifi_detach_recv_cb() | ||
| { | ||
| wifi_recv_cb = NULL; | ||
| } | ||
|
|
||
| void wifi_init() { | ||
| /* Init NVS */ | ||
| esp_err_t ret = nvs_flash_init(); | ||
| if (ret == ESP_ERR_NVS_NO_FREE_PAGES || ret == ESP_ERR_NVS_NEW_VERSION_FOUND) { | ||
| ESP_ERROR_CHECK( nvs_flash_erase() ); | ||
| ret = nvs_flash_init(); | ||
| } | ||
| ESP_ERROR_CHECK( ret ); | ||
|
|
||
| /* Init WiFi */ | ||
| tcpip_adapter_init(); | ||
| ESP_ERROR_CHECK(esp_event_loop_create_default()); | ||
| wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT(); | ||
| cfg.ampdu_tx_enable = 0; | ||
| ESP_ERROR_CHECK( esp_wifi_init(&cfg) ); | ||
| ESP_ERROR_CHECK( esp_wifi_set_storage(WIFI_STORAGE_RAM) ); | ||
| ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) ); | ||
| wifi_country_t country = {.cc="JP", .schan=1, .nchan=14, .policy=WIFI_COUNTRY_POLICY_MANUAL}; | ||
| ESP_ERROR_CHECK( esp_wifi_start() ); | ||
| ESP_ERROR_CHECK( esp_wifi_set_country(&country) ); | ||
| ESP_ERROR_CHECK( esp_wifi_set_channel(CONFIG_WIFI_CHANNEL, WIFI_SECOND_CHAN_NONE) ); | ||
| ESP_ERROR_CHECK( esp_wifi_internal_set_fix_rate(ESP_IF_WIFI_STA, true, CONFIG_WIFI_DATARATE) ); | ||
| void wifi_init() | ||
| { | ||
| /* Init NVS */ | ||
| esp_err_t ret = nvs_flash_init(); | ||
| if (ret == ESP_ERR_NVS_NO_FREE_PAGES || ret == ESP_ERR_NVS_NEW_VERSION_FOUND) | ||
| { | ||
| ESP_ERROR_CHECK(nvs_flash_erase()); | ||
| ret = nvs_flash_init(); | ||
| } | ||
| ESP_ERROR_CHECK(ret); | ||
|
|
||
| /* Init WiFi */ | ||
| tcpip_adapter_init(); | ||
| wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT(); | ||
| cfg.ampdu_tx_enable = 0; | ||
| ESP_ERROR_CHECK(esp_wifi_init(&cfg)); | ||
| ESP_ERROR_CHECK(esp_wifi_set_storage(WIFI_STORAGE_RAM)); | ||
| ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA)); | ||
| wifi_country_t country = {.cc = "JP", .schan = 1, .nchan = 14, .policy = WIFI_COUNTRY_POLICY_MANUAL}; | ||
| ESP_ERROR_CHECK(esp_wifi_start()); | ||
| ESP_ERROR_CHECK(esp_wifi_set_country(&country)); | ||
| ESP_ERROR_CHECK(esp_wifi_set_channel(CONFIG_WIFI_CHANNEL, WIFI_SECOND_CHAN_NONE)); | ||
| ESP_ERROR_CHECK(esp_wifi_internal_set_fix_rate(ESP_IF_WIFI_STA, true, CONFIG_WIFI_DATARATE)); | ||
|
|
||
| /* Init ESPNOW */ | ||
| ESP_ERROR_CHECK( esp_now_init() ); | ||
|
|
||
| memset(&peer, 0, sizeof(esp_now_peer_info_t)); | ||
| peer.channel = CONFIG_WIFI_CHANNEL; | ||
| peer.ifidx = ESP_IF_WIFI_STA; | ||
| peer.encrypt = false; | ||
| memcpy(peer.peer_addr, s_example_broadcast_mac, ESP_NOW_ETH_ALEN); | ||
| ESP_ERROR_CHECK( esp_now_add_peer(&peer) ); | ||
| } | ||
| ESP_ERROR_CHECK(esp_now_init()); | ||
| ESP_ERROR_CHECK(esp_now_register_recv_cb(wifi_recv_func)); | ||
|
|
||
| memset(&peer, 0, sizeof(esp_now_peer_info_t)); | ||
| peer.channel = CONFIG_WIFI_CHANNEL; | ||
| peer.ifidx = ESP_IF_WIFI_STA; | ||
| peer.encrypt = false; | ||
| memcpy(peer.peer_addr, s_example_broadcast_mac, ESP_NOW_ETH_ALEN); | ||
| ESP_ERROR_CHECK(esp_now_add_peer(&peer)); | ||
| } | ||
|
|
||
| void wifi_deinit_func() | ||
| { | ||
| ESP_ERROR_CHECK(esp_now_deinit()); | ||
| ESP_ERROR_CHECK(esp_wifi_stop()); | ||
| ESP_ERROR_CHECK(esp_wifi_deinit()); | ||
| } | ||
|
|
||
| void wifi_change_channel(uint8_t wifi_channel) | ||
| { | ||
| ESP_ERROR_CHECK(esp_wifi_set_channel(wifi_channel, WIFI_SECOND_CHAN_NONE)); | ||
| peer.channel = wifi_channel; | ||
| ESP_ERROR_CHECK(esp_now_mod_peer(&peer)); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.