Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit3a96b4e

Browse files
committed
Revert "fix: package size calculation"
This reverts commit7a19f23.
1 parent7a19f23 commit3a96b4e

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

‎library.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name":"OFM-FileTransferModule",
3-
"version":"0.1.5",
3+
"version":"0.1.4",
44
"dependencies":
55
{
66
"frankboesing/FastCRC":"^1.41"

‎src/FileTransferModule.cpp‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,14 @@ void FileTransferModule::readFile(uint16_t sequence, uint8_t *resultData, uint8_
116116
logIndentUp();
117117

118118
if (_lastSequence +1 != sequence)
119-
_file.seek((sequence -1) * (_size));
119+
_file.seek((sequence -1) * (_size -6));
120120

121121
pushByte(0x0, resultData);
122122
pushWord(sequence, resultData +1);
123-
uint8_t readed = _file.readBytes((char *)resultData +4, _size);
123+
uint8_t readed = _file.readBytes((char *)resultData +4, _size -6);
124124
pushByte(readed, resultData +3);
125125

126-
logDebugP("Readed sequence %i (%i/%i bytes)", sequence, readed, _size);
126+
logDebugP("Readed sequence %i (%i/%i bytes)", sequence, readed, _size -6);
127127
if (readed ==0 || !_file.available())
128128
{
129129
_file.close();
@@ -147,7 +147,7 @@ void FileTransferModule::writeFile(uint16_t sequence, uint8_t *data, uint8_t len
147147

148148
if (_lastSequence +1 != sequence)
149149
{
150-
uint32_t pos = ((sequence -1) * _size);
150+
uint32_t pos = ((sequence -1) *(_size -3));
151151
logDebugP("Not continous sequence - seek to position %d [expected %i, got %i]", pos, _lastSequence +1, sequence);
152152
if (!_file.seek(pos))
153153
{
@@ -166,6 +166,12 @@ void FileTransferModule::writeFile(uint16_t sequence, uint8_t *data, uint8_t len
166166
uint8_t written = _file.write((constuint8_t *)data +3, data[2]);
167167
logDebugP("Write sequence %i (%i/%i bytes) %i.%i", sequence, written, data[2], filePos, _file.position());
168168

169+
// if (sequence % 10 == 0)
170+
// {
171+
// logDebugP("Flush file");
172+
// _file.flush();
173+
// }
174+
169175
if (written != data[2])
170176
{
171177
pushByte(0x47, resultData);

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp