SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@462 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Бычков Андрей
2017-04-21 12:53:11 +00:00
parent cf5acbe72e
commit bf02406736
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src_main/io/pibasetransfer.cpp
View File

@@ -18,7 +18,7 @@ PIBaseTransfer::PIBaseTransfer(): crc(standardCRC_16()), diag(false) {
//CONNECTU(&diag, qualityChanged, this, diagChanged); //CONNECTU(&diag, qualityChanged, this, diagChanged);
diag.setName("PIBaseTransfer"); diag.setName("PIBaseTransfer");
diag.start(50); diag.start(50);
packets_count = 32; packets_count = 100;
setPacketSize(4096); setPacketSize(4096);
randomize(); randomize();
} }
@@ -437,7 +437,6 @@ void PIBaseTransfer::sendReply(PacketType reply) {
bool PIBaseTransfer::getStartRequest() { bool PIBaseTransfer::getStartRequest() {
PITimeMeasurer tm;
mutex_header.lock(); mutex_header.lock();
header.type = pt_Start; header.type = pt_Start;
header.id = 0; header.id = 0;
@@ -449,6 +448,7 @@ bool PIBaseTransfer::getStartRequest() {
mutex_header.unlock(); mutex_header.unlock();
ba << st; ba << st;
state_string = "send request"; state_string = "send request";
PITimeMeasurer tm;
while (tm.elapsed_s() < timeout_) { while (tm.elapsed_s() < timeout_) {
diag.sended(ba.size_s()); diag.sended(ba.size_s());
sendRequest(ba); sendRequest(ba);

4
utils/system_daemon/main.cpp
View File

@@ -85,7 +85,7 @@ public:
CONNECTU(screen, tileEvent, this, tileEvent) CONNECTU(screen, tileEvent, this, tileEvent)
CONNECTU(screen, keyPressed, this, keyEvent) CONNECTU(screen, keyPressed, this, keyEvent)
CONNECTU(&daemon_, menuRequest, this, menuRequest) CONNECTU(&daemon_, menuRequest, this, menuRequest)
start(50); start(25);
} }
PIScreenTile * menuTile() { PIScreenTile * menuTile() {
TileList * ret = new TileList(); TileList * ret = new TileList();
@@ -209,7 +209,7 @@ public:
screen->unlock(); screen->unlock();
} }
void tick(void* data_, int delimiter) { void tick(void* data_, int delimiter) {
if (tpeerdiag->visible || tinfo->visible) if (tpeerdiag->visible || tpeer->visible)
updatePeerInfo(); updatePeerInfo();
} }
EVENT_HANDLER(void, menuRequest) { EVENT_HANDLER(void, menuRequest) {