Skip to content

Commit baea4c0

Browse files
committed
p2p upd
1 parent ddbc8c2 commit baea4c0

File tree

1 file changed

+27
-8
lines changed

1 file changed

+27
-8
lines changed

TurtleBook_wemos/TurtleBook_wemos.ino

+27-8
Original file line numberDiff line numberDiff line change
@@ -791,30 +791,42 @@ void p2pRecieverMode() {
791791
p2p_server.begin();
792792
Serial.print("cp2");
793793
Serial.print('\r');
794+
Serial.flush();
794795
WiFiClient client = p2p_server.available(); // Проверка подключения клиента
795796
while (!client) {
796797
delay(100);
798+
client = p2p_server.available();
797799
}
800+
Serial.print("cp22");
801+
Serial.print('\r');
802+
Serial.flush();
798803
while (!client.available()) { // Ожидание запроса клиента
799-
delay(1);
804+
delay(10);
800805
}
801806
Serial.print("cp3");
802807
Serial.print('\r');
808+
Serial.flush();
809+
803810
client.setTimeout(100000);
804811
String filename = client.readStringUntil('\r'); // filename
805812
filename.trim();
806813
if (!filename.startsWith("/"))
807814
filename = "/" + filename;
808815
Serial.print("cp4");
809816
Serial.print('\r');
817+
Serial.flush();
810818

811819
Serial.print(filename);
812820
Serial.print('\r');
821+
Serial.flush();
822+
813823
String request2 = client.readStringUntil('\r'); // size
814824
request2.trim();
815825
auto size = request2.toInt();
816826
Serial.print(size);
817827
Serial.print('\r');
828+
Serial.flush();
829+
818830
//client.flush();
819831
// Initialize the SD.
820832
my_DEV_Module_Init();
@@ -825,16 +837,22 @@ void p2pRecieverMode() {
825837
}
826838
Serial.print("cp5");
827839
Serial.print('\r');
840+
Serial.flush();
828841

829842
file = sd.open(filename, MFILE_WRITE);
830843
Serial.print("cp6");
831844
Serial.print('\r');
845+
Serial.flush();
846+
832847
for (long ii = 0; ii < size; ii++) {
848+
while (!client.available())
849+
delay(1);
833850
file.write(client.read());
834-
if (ii % 1000 == 0) {
835-
float vv = ii / size;
851+
if (ii % 10000 == 0) {
852+
float vv = ii / (float)size;
836853
Serial.print((int)(100 * vv));
837854
Serial.print('\r');
855+
Serial.flush();
838856
}
839857
}
840858

@@ -925,7 +943,7 @@ void p2pSenderMode() {
925943
Serial.flush();
926944
delay(500);
927945

928-
946+
929947
if (!dPath.startsWith("/"))
930948
dPath = "/" + dPath;
931949

@@ -940,11 +958,12 @@ void p2pSenderMode() {
940958
file = sd.open(dPath, MFILE_READ);
941959
//Serial.println("max");
942960

943-
auto sz = file.size();
961+
auto sz = file.size();
944962
client.print(sz);
945963
client.print('\r');
946964
client.flush();
947965
for (long i = 0; i < sz; i++) {
966+
948967
client.write(file.read());
949968
if (i % 10000 == 0) {
950969
float vv = i / (float)sz;
@@ -953,12 +972,12 @@ void p2pSenderMode() {
953972
Serial.flush();
954973
}
955974
}
956-
file.close();
957-
975+
file.close();
976+
958977

959978
WiFi.mode(WIFI_OFF); // TURN OFF WIFI
960979
Serial.print("end");
961-
Serial.print('\r');
980+
Serial.print('\r');
962981
Serial.flush();
963982
WiFi.forceSleepBegin();
964983
ESP.deepSleep(0);

0 commit comments

Comments
 (0)