Skip to content

Import SSU and add minor changes #1

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

Merged
merged 2 commits into from
Jun 25, 2020
Merged

Import SSU and add minor changes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2478d9
Import SSU and add minor changes
manchoz Jun 23, 2020
98e0857
Merge branch 'GSMOTA' into manchoz_test_ssu
Rocketct Jun 25, 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
40 changes: 17 additions & 23 deletions libraries/SSU/examples/SSU_LoadBinary/SSU_LoadBinary.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,24 @@
* INCLUDE
**************************************************************************************/

#include <Arduino_MKRMEM.h>

#include <MKRGSM.h>


/**************************************************************************************
* CONSTANTS
**************************************************************************************/

static uint8_t const BINARY[] =
static char const BINARY[] =

{
#include "Binary.h"
};


GSMFileUtils fileUtils;


/**************************************************************************************
* SETUP/LOOP
**************************************************************************************/
Expand All @@ -22,40 +29,27 @@ void setup() {

unsigned long const start = millis();
for(unsigned long now = millis(); !Serial && ((now - start) < 5000); now = millis()) { };

flash.begin();

Serial.print("Mounting ... ");
if(SPIFFS_OK != filesystem.mount()) {
Serial.println("mount() failed with error code "); Serial.println(filesystem.err()); return;
}
Serial.println("OK");

Serial.print("Accessing SARA U-201 Filesystem... ");
if(!fileUtils.begin()) {
Serial.println("failed.");
return;

Serial.print("Checking ... ");
if(SPIFFS_OK != filesystem.check()) {
Serial.println("check() failed with error code "); Serial.println(filesystem.err()); return;
}
Serial.println("OK");


Serial.print("Writing \"UPDATE.BIN\" ... ");
File file = filesystem.open("UPDATE.BIN", CREATE | READ_WRITE| TRUNCATE);

int const bytes_to_write = sizeof(BINARY);
int const bytes_written = file.write((void *)BINARY, bytes_to_write);
uint32_t bytes_to_write = sizeof(BINARY);
auto bytes_written = fileUtils.downloadFile("UPDATE.BIN", BINARY, bytes_to_write);

if(bytes_written != bytes_to_write) {
Serial.println("write() failed with error code "); Serial.println(filesystem.err()); return;
Serial.println("downloadFile failed.");return;

} else {
Serial.print("OK (");
Serial.print(bytes_written);
Serial.println(" bytes written)");
}

Serial.print("Unmounting ... ");
filesystem.unmount();
Serial.println("OK");
}

void loop() {
Expand Down
4 changes: 3 additions & 1 deletion libraries/SSU/examples/SSU_Usage/SSU_Usage.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@
running on the board. After this UPDATE.BIN is deleted from the flash.
*/

#include <SFU.h>

#include <SSU.h>


void setup() {
Serial.begin(9600);
Expand Down
37 changes: 22 additions & 15 deletions libraries/SSU/extras/SSUBoot/SSUBoot.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
**************************************************************************************/

#include <FlashStorage.h>
#include "MKRGSM.h"
#include <MKRGSM.h>


/**************************************************************************************
DEFINE
Expand All @@ -36,14 +37,18 @@
GLOBAL CONSTANTS
**************************************************************************************/

static char const UPDATE_FILE_NAME[] = "UPDATE.BIN";
static constexpr char UPDATE_FILE_NAME[] = "UPDATE.BIN";
static constexpr char CHECK_FILE_NAME[] = "UPDATE.OK";


/**************************************************************************************
GLOBAL VARIABLES
**************************************************************************************/

FlashClass mcu_flash;
GSMFileUtils fileUtils(false);

GSMFileUtils fileUtils;

/**************************************************************************************
FUNCTION DECLARATION
**************************************************************************************/
Expand All @@ -62,16 +67,18 @@ int main()

delay(1);

String filename = UPDATE_FILE_NAME;
constexpr size_t blockSize = 512;

const size_t blockSize = 512;

MODEM.begin();
fileUtils.begin();

bool update_success = false;
if (fileUtils.listFile("UPDATE.OK") == 1) {
auto size = fileUtils.listFile(filename);
auto cycles = (size / blockSize) + 1;

// Try to update only if update file
// has been download successfully.
if (fileUtils.listFile(CHECK_FILE_NAME) == 1) {
uint32_t size = fileUtils.listFile(UPDATE_FILE_NAME);
size_t cycles = (size / blockSize) + 1;

if (size > SSU_SIZE) {
size -= SSU_SIZE;

Expand All @@ -81,17 +88,17 @@ int main()

for (auto i = 0; i < cycles; i++) {
uint8_t block[blockSize] { 0 };
digitalWrite(LED_BUILTIN,LOW);
auto read = fileUtils.readBlock(filename, (i * blockSize) + SSU_SIZE, blockSize, block);
digitalWrite(LED_BUILTIN,HIGH);
digitalWrite(LED_BUILTIN, LOW);
uint32_t read = fileUtils.readBlock(UPDATE_FILE_NAME, (i * blockSize) + SSU_SIZE, blockSize, block);
digitalWrite(LED_BUILTIN, HIGH);
mcu_flash.write((void*)flash_address, block, read);
flash_address += read;
}
update_success = true;
}
if (update_success) {
fileUtils.deleteFile(filename);
fileUtils.deleteFile("UPDATE.OK");
fileUtils.deleteFile(UPDATE_FILE_NAME);
fileUtils.deleteFile(CHECK_FILE_NAME);
}
}
/* Jump to the sketch */
Expand Down
Loading