Skip to content

Commit

Permalink
Merge pull request #310 from rennancockles/dev
Browse files Browse the repository at this point in the history 
select receiver on file send
  • Loading branch information
@pr3y
pr3y authored Oct 5, 2024
2 parents 89537ce + 634e058 commit a1af3fe
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 45 deletions.
132 changes: 92 additions & 40 deletions src/core/connect.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,44 +17,45 @@

DeviceConnection::Status espnowSendStatus;
std::vector<DeviceConnection::FileMessage> recvQueue;
uint8_t broadcastAddress[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
uint8_t dstAddress[6];
std::vector<Option> peerOptions;


DeviceConnection::DeviceConnection() {}
DeviceConnection::~DeviceConnection() { esp_now_deinit(); }
DeviceConnection::~DeviceConnection() {
esp_now_unregister_send_cb();
esp_now_unregister_recv_cb();

esp_now_deinit();
}


void DeviceConnection::sendFile() {
drawMainBorderWithTitle("SEND FILE");

sendStatus = CONNECTING;
WiFi.mode(WIFI_STA);

if (esp_now_init() != ESP_OK) {
displayError("Error initializing share");
returnToMenu=true;
delay(1000);
return;
}
if (!espnowBegin()) return;

if (!setupPeer()) {
sendPing();

loopOptions(peerOptions);
if (!setupPeer(dstAddress)) {
displayError("Failed to add peer");
returnToMenu=true;
delay(1000);
return;
}

File file = selectFile();
if (!file) {
displayError("Error selecting file");
returnToMenu=true;
delay(1000);
return;
}

FileMessage message = createFileMessage(file);

esp_now_register_send_cb(onDataSent);

esp_err_t response;
sendStatus = STARTED;
espnowSendStatus = STARTED;
Expand All @@ -73,7 +74,7 @@ void DeviceConnection::sendFile() {
if (sendStatus == ABORTED || sendStatus == FAILED) {
message.done = true;
message.dataSize = 0;
esp_now_send(broadcastAddress, (uint8_t*)&message, sizeof(message));
esp_now_send(dstAddress, (uint8_t*)&message, sizeof(message));
displayError("Error sending file");
break;
}
Expand All @@ -83,7 +84,7 @@ void DeviceConnection::sendFile() {
message.bytesSent = min(message.bytesSent+bytesRead, message.totalBytes);
message.done = message.bytesSent == message.totalBytes;

response = esp_now_send(broadcastAddress, (uint8_t*)&message, sizeof(message));
response = esp_now_send(dstAddress, (uint8_t*)&message, sizeof(message));
if (response != ESP_OK) {
Serial.printf("Send file response: %s\n", esp_err_to_name(response));
sendStatus = FAILED;
Expand All @@ -96,8 +97,6 @@ void DeviceConnection::sendFile() {
if (message.bytesSent == message.totalBytes) displaySuccess("File sent");

file.close();
esp_now_unregister_send_cb();
returnToMenu=true;
delay(1000);
}

Expand All @@ -110,15 +109,8 @@ void DeviceConnection::receiveFile() {
recvFileName = "";
recvQueue = {};
recvStatus = CONNECTING;
WiFi.mode(WIFI_STA);

if (esp_now_init() != ESP_OK) {
displayError("Error initializing share");
delay(1000);
return;
}

esp_now_register_recv_cb(onDataRecv);
if (!espnowBegin()) return;

delay(100);

Expand Down Expand Up @@ -157,7 +149,6 @@ void DeviceConnection::receiveFile() {
delay(100);
}

esp_now_unregister_recv_cb();
delay(1000);

if (recvStatus == SUCCESS) {
Expand All @@ -172,24 +163,25 @@ void DeviceConnection::receiveFile() {
}


bool DeviceConnection::setupPeer() {
peerInfo = {};
peerInfo.channel = 0;
peerInfo.encrypt = false;
memcpy(peerInfo.peer_addr, broadcastAddress, 6);
bool DeviceConnection::espnowBegin() {
WiFi.mode(WIFI_STA);

if (esp_now_init() != ESP_OK) {
displayError("Error initializing share");
delay(1000);
return false;
}

Serial.print("Adding peer: ");
for (byte i = 0; i < 6; i++) {
if (i>0) Serial.print(":");
Serial.print(broadcastAddress[i] < 0x10 ? "0" : "");
Serial.print(broadcastAddress[i], HEX);
if (!setupPeer(broadcastAddress)) {
displayError("Failed to add peer");
delay(1000);
return false;
}
Serial.println();

esp_err_t add_peer_resp = esp_now_add_peer(&peerInfo);
// Serial.printf("Add peer response: 0X%x\n", add_peer_resp);
esp_now_register_send_cb(onDataSent);
esp_now_register_recv_cb(onDataRecv);

return add_peer_resp == ESP_OK;
return true;
}


Expand Down Expand Up @@ -264,6 +256,63 @@ void DeviceConnection::createFilename(FS *fs, DeviceConnection::FileMessage file
}


bool setupPeer(const uint8_t* mac) {
if (esp_now_is_peer_exist(mac)) return true;

esp_now_peer_info_t peerInfo = {};

memcpy(peerInfo.peer_addr, mac, 6);
peerInfo.channel = 0;
peerInfo.encrypt = false;

return esp_now_add_peer(&peerInfo) == ESP_OK;
}


void appendPeerToList(const uint8_t* mac) {
peerOptions.push_back(
{macToString(mac), [=]() { memcpy(dstAddress, mac, 6); }}
);
}


std::string macToString(const uint8_t* mac) {
char macStr[18];
sprintf(macStr, "%02X%02X%02X%02X%02X%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
return std::string(macStr);
}


void sendPing() {
peerOptions = {
{"Broadcast", [=]() { memcpy(dstAddress, broadcastAddress, 6); }},
};

DeviceConnection::FileMessage message;
message.ping = true;

esp_err_t response = esp_now_send(broadcastAddress, (uint8_t*)&message, sizeof(message));
if (response != ESP_OK) {
Serial.printf("Send ping response: %s\n", esp_err_to_name(response));
}

delay(500);
}


void sendPong(const uint8_t* mac) {
DeviceConnection::FileMessage message;
message.pong = true;

if (!setupPeer(mac)) return;

esp_err_t response = esp_now_send(mac, (uint8_t*)&message, sizeof(message));
if (response != ESP_OK) {
Serial.printf("Send pong response: %s\n", esp_err_to_name(response));
}
}


void onDataSent(const uint8_t* mac_addr, esp_now_send_status_t status) {
if (status == ESP_NOW_SEND_SUCCESS) {
espnowSendStatus = DeviceConnection::SUCCESS;
Expand All @@ -279,6 +328,9 @@ void onDataRecv(const uint8_t* mac, const uint8_t* incomingData, int len) {
DeviceConnection::FileMessage recvFileMessage;
memcpy(&recvFileMessage, incomingData, sizeof(recvFileMessage));

if (recvFileMessage.ping) return sendPong(mac);
if (recvFileMessage.pong) return appendPeerToList(mac);

Serial.print("Name: ");
Serial.println(recvFileMessage.filename);
Serial.print("Path: ");
Expand Down
17 changes: 12 additions & 5 deletions src/core/connect.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ class DeviceConnection {
size_t totalBytes;
size_t bytesSent;
char data[PAGE_BYTES];
size_t dataSize;
bool done;
size_t dataSize = 0;
bool done = false;
bool ping = false;
bool pong = false;
} FileMessage;

/////////////////////////////////////////////////////////////////////////////////////
Expand All @@ -52,13 +54,11 @@ class DeviceConnection {
Status recvStatus;
Status sendStatus;
String recvFileName;
uint8_t broadcastAddress[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
esp_now_peer_info_t peerInfo;

/////////////////////////////////////////////////////////////////////////////////////
// Helpers
/////////////////////////////////////////////////////////////////////////////////////
bool setupPeer();
bool espnowBegin();
File selectFile();
FileMessage createFileMessage(File file);
bool appendToFile(FileMessage fileMessage);
Expand All @@ -68,4 +68,11 @@ class DeviceConnection {
void onDataSent(const uint8_t* mac_addr, esp_now_send_status_t status);
void onDataRecv(const uint8_t* mac, const uint8_t* incomingData, int len);

void sendPing();
void sendPong(const uint8_t* mac);

bool setupPeer(const uint8_t* mac);
void appendPeerToList(const uint8_t* mac);
std::string macToString(const uint8_t* mac);

#endif

0 comments on commit a1af3fe

Please sign in to comment.