Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for SARA U2 Filesystem #113

Merged
merged 10 commits into from
Jun 26, 2020
+997 −0
Merged

Add support for SARA U2 Filesystem #113

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9fb5939
Add support for U-201 Storage
manchoz Jun 18, 2020
614f08c
Manage OTA files
manchoz Jun 18, 2020
91169ae
Revert binary files management
manchoz Jun 19, 2020
c6bb1c0
Store data in HEX format to prevent inception
manchoz Jun 19, 2020
bc5fa6b
Update file list and count only on new files
manchoz Jun 19, 2020
4d5372b
Update example and add description
manchoz Jun 19, 2020
add0b7f
Add example for buffered download and storage
manchoz Jun 19, 2020
7fc49f7
Add example for JSON/Struct + FileUtils
manchoz Jun 19, 2020
1dce5e7
FileUtils::begin(bool) handles opt MODEM::begin()
manchoz Jun 23, 2020
93fc09c
FileUtils:downloadFile() returns size
manchoz Jun 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Store data in HEX format to prevent inception
@manchoz
manchoz committed Jun 22, 2020
commit c6bb1c007f4a0e35ac5ce70fa1be109212e084cb
170 changes: 93 additions & 77 deletions src/GSMFileUtils.cpp
View file
Original file line number Diff line number Diff line change
@@ -85,61 +85,52 @@ size_t GSMFileUtils::listFiles(String files[]) const
return n;
}

void GSMFileUtils::downloadFile(const String filename, const char buf[], uint32_t size, const bool binary, const bool append)
void GSMFileUtils::downloadFile(const String filename, const char buf[], uint32_t size, const bool append)
{
String response;
bool fileExists = append ? append : listFile(filename) > 0;

if (fileExists && !append)
if (!append)
deleteFile(filename);

// MODEM.send("AT+CGEREP?");
// MODEM.waitForResponse();

if (binary) {
MODEM.send("ATE0");
MODEM.waitForResponse();
}

MODEM.sendf("AT+UDWNFILE=\"%s\",%d", filename.c_str(), size);
MODEM.sendf("AT+UDWNFILE=\"%s\",%d", filename.c_str(), size * 2);
MODEM.waitForPrompt(20000);

for (auto i = 0; i < size; i++)
MODEM.write(buf[i]);
char hex[size * 2] { 0 };

int status = MODEM.waitForResponse(1000, &response);
for (auto i = 0; i < size; i++) {
byte b = buf[i];

if (status && (!append || !fileExists)) {
if (_count == 0)
_files.concat("\"" + filename + "\"");
else
_files.concat(",\"" + filename + "\"");
_count++;
byte n1 = (b >> 4) & 0x0f;
byte n2 = (b & 0x0f);

hex[i * 2] = (char)(n1 > 9 ? 'A' + n1 - 10 : '0' + n1);
hex[i * 2 + 1] = (char)(n2 > 9 ? 'A' + n2 - 10 : '0' + n2);
}
for (auto h: hex)
MODEM.write(h);

if (binary) {
MODEM.send("ATE1");
MODEM.waitForResponse();
int status = MODEM.waitForResponse(1000, &response);

if (status) {
_getFileList();
_countFiles();
}
}

uint32_t GSMFileUtils::readFile(const String filename, String* content, const bool binary)
uint32_t GSMFileUtils::readFile(const String filename, String* content)
{
String response;

if (!listFile(filename)) {
Serial.println("File does not exist.");
return 0;
}

if (binary)
MODEM.binary();

MODEM.sendf("AT+URDFILE=\"%s\"", filename.c_str());
MODEM.waitForResponse(1000, &response);

size_t skip = 10;
String _content = response.substring(skip);

int commaIndex = _content.indexOf(',');
skip += commaIndex;

@@ -148,35 +139,42 @@ uint32_t GSMFileUtils::readFile(const String filename, String* content, const bo
skip += commaIndex;

String sizePart = _content.substring(0, commaIndex);
uint32_t size = sizePart.toInt();
uint32_t size = sizePart.toInt() / 2;
skip += 3;

if (binary) {
(*content).reserve(size);
*content = "";
for (auto i = 0; i < size; i++) {
*content += response[skip + i];
String * _data = content;
(*_data).reserve(size);

for (auto i = 0; i < size; i++) {
byte n1 = response[skip + i * 2];
byte n2 = response[skip + i * 2 + 1];

if (n1 > '9') {
n1 = (n1 - 'A') + 10;
} else {
n1 = (n1 - '0');
}
} else {
_content = _content.substring(commaIndex + 2);
*content = _content.substring(0, size);

if (n2 > '9') {
n2 = (n2 - 'A') + 10;
} else {
n2 = (n2 - '0');
}

(*_data) += (char)((n1 << 4) | n2);
}

if (binary)
MODEM.noBinary();
return size;
return (*_data).length();
}

uint32_t GSMFileUtils::readBinary(const String filename, uint8_t* content)
uint32_t GSMFileUtils::readFile(const String filename, uint8_t* content)
{
String response;

if (listFile(filename) == 0) {
return 0;
}

MODEM.binary();

MODEM.sendf("AT+URDFILE=\"%s\"", filename.c_str());
MODEM.waitForResponse(1000, &response);

@@ -191,32 +189,42 @@ uint32_t GSMFileUtils::readBinary(const String filename, uint8_t* content)
skip += commaIndex;

String sizePart = _content.substring(0, commaIndex);
uint32_t size = sizePart.toInt();
uint32_t size = sizePart.toInt() / 2;
skip += 3;

for (auto i = 0; i < size; i++)
content[i] = response[skip + i];
for (auto i = 0; i < size; i++) {
byte n1 = response[skip + i * 2];
byte n2 = response[skip + i * 2 + 1];

MODEM.noBinary();
if (n1 > '9') {
n1 = (n1 - 'A') + 10;
} else {
n1 = (n1 - '0');
}

if (n2 > '9') {
n2 = (n2 - 'A') + 10;
} else {
n2 = (n2 - '0');
}

content[i] = (n1 << 4) | n2;
}

return size;
}

uint32_t GSMFileUtils::readBlock(const String filename, const uint32_t offset, const uint32_t len, uint8_t* content, const bool binary)
uint32_t GSMFileUtils::readBlock(const String filename, const uint32_t offset, const uint32_t len, uint8_t* content)
{
String response;

if (listFile(filename) == 0) {
return 0;
}

// if (binary)
MODEM.binary();

MODEM.sendf("AT+URDBLOCK=\"%s\",%d,%d", filename.c_str(), offset, len);
MODEM.sendf("AT+URDBLOCK=\"%s\",%d,%d", filename.c_str(), offset * 2, len * 2);
MODEM.waitForResponse(1000, &response);

// +URDBLOCK: "update.bin",512,"..."\r\n
size_t skip = 10;
String _content = response.substring(skip);

@@ -228,40 +236,48 @@ uint32_t GSMFileUtils::readBlock(const String filename, const uint32_t offset, c
skip += commaIndex;

String sizePart = _content.substring(0, commaIndex);
uint32_t size = sizePart.toInt();
uint32_t size = sizePart.toInt() / 2;
skip += 3;

for (auto i = 0; i < size; i++)
content[i] = response[skip + i];
for (auto i = 0; i < size; i++) {
byte n1 = response[skip + i * 2];
byte n2 = response[skip + i * 2 + 1];

if (n1 > '9') {
n1 = (n1 - 'A') + 10;
} else {
n1 = (n1 - '0');
}

if (n2 > '9') {
n2 = (n2 - 'A') + 10;
} else {
n2 = (n2 - '0');
}

// if (binary)
MODEM.noBinary();
content[i] = (n1 << 4) | n2;
}

return size;
}

int GSMFileUtils::deleteFile(const String filename)
bool GSMFileUtils::deleteFile(const String filename)
{
String response;

int start = _files.indexOf(filename);
int count = filename.length();
if (start == 1) {
start = 0;
count += 3;
} else {
start -= 2;
count += 3;
}
if (listFile(filename) == 0)
return false;

MODEM.sendf("AT+UDELFILE=\"%s\"", filename.c_str());
if (MODEM.waitForResponse(100, &response)) {
_files.remove(start, count);
if (_count > 0)
_count--;
return 1;
}
return 0;
auto status = MODEM.waitForResponse(100, &response);

if (status == 0)
return false;

_getFileList();
_countFiles();

return true;
}

int GSMFileUtils::deleteFiles()
@@ -291,7 +307,7 @@ uint32_t GSMFileUtils::listFile(const String filename) const
size = content.toInt();
}

return size;
return size / 2;
}

uint32_t GSMFileUtils::freeSpace()
26 changes: 11 additions & 15 deletions src/GSMFileUtils.h
View file
Original file line number Diff line number Diff line change
@@ -9,28 +9,24 @@ class GSMFileUtils {

bool begin(const unsigned long timeout);
bool begin() { return begin(10000); };
u_int32_t fileCount() const { return _count; };
uint32_t fileCount() const { return _count; };
size_t listFiles(String list[]) const;
u_int32_t listFile(const String filename) const;
uint32_t listFile(const String filename) const;

void downloadFile(const String filename, const char buf[], const uint32_t size, const bool binary, const bool append);
void downloadFile(const String filename, const char buf[], const uint32_t size) { downloadFile(filename, buf, size, false, true); };
void downloadFile(const String filename, const String& buf, const bool binary = false, const bool append = false) { downloadFile(filename, buf.c_str(), buf.length(), binary, append); }
void downloadFile(const String filename, const char buf[], const uint32_t size, const bool append);
void downloadFile(const String filename, const char buf[], const uint32_t size) { downloadFile(filename, buf, size, false); };
void downloadFile(const String filename, const String& buf) { downloadFile(filename, buf.c_str(), buf.length(), false); }

void appendFile(const String filename, const String& buf) { downloadFile(filename, buf.c_str(), buf.length(), false, true); }
void appendFile(const String filename, const char buf[], const uint32_t size) { downloadFile(filename, buf, size, false, true); }
void appendFile(const String filename, const String& buf) { downloadFile(filename, buf.c_str(), buf.length(), true); }
void appendFile(const String filename, const char buf[], const uint32_t size) { downloadFile(filename, buf, size, true); }

void downloadBinary(const String filename, const char buf[], const uint32_t size, const bool append = false) { downloadFile(filename, buf, size, true, append); }
void downloadBinary(const String filename, const String& buf, const bool append = false) { downloadFile(filename, buf.c_str(), buf.length(), true, append); }

int deleteFile(const String filename);
bool deleteFile(const String filename);
int deleteFiles();

uint32_t readFile(const String filename, String* content, const bool binary = false);
uint32_t readFile(const String filename, uint8_t* content, const bool binary = true);
uint32_t readBinary(const String filename, uint8_t* content);
uint32_t readFile(const String filename, String* content);
uint32_t readFile(const String filename, uint8_t* content);
// size_t readBlock(const String filename, String* content, const bool binary = false);
uint32_t readBlock(const String filename, const uint32_t offset, const uint32_t len, uint8_t* content, const bool binary = true);
uint32_t readBlock(const String filename, const uint32_t offset, const uint32_t len, uint8_t* content);

uint32_t freeSpace();