Skip to content

Extend timeouts in SAM-BA #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

Open
wants to merge 1 commit into
base: nrf
Choose a base branch
from
Open

Extend timeouts in SAM-BA #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions src/Samba.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ using namespace std;
#define CAN 0x18
#define START 'C'

#define TIMEOUT_QUICK 100
#define TIMEOUT_NORMAL 1000
#define TIMEOUT_LONG 5000

Expand All @@ -75,7 +74,7 @@ Samba::init()
{
uint8_t cmd[3];

_port->timeout(TIMEOUT_QUICK);
_port->timeout(TIMEOUT_NORMAL);

// Flush garbage
uint8_t dummy[1024];
Expand Down Expand Up @@ -564,7 +563,7 @@ Samba::version()
cmd[1] = '#';
_port->write(cmd, 2);

_port->timeout(TIMEOUT_QUICK);
_port->timeout(TIMEOUT_NORMAL);
size = _port->read(cmd, sizeof(cmd) - 1);
_port->timeout(TIMEOUT_NORMAL);
if (size <= 0)
Expand Down Expand Up @@ -598,7 +597,7 @@ Samba::identifyChip()
cmd[1] = '#';
_port->write(cmd, 2);

_port->timeout(TIMEOUT_QUICK);
_port->timeout(TIMEOUT_NORMAL);
size = _port->read(cmd, sizeof(cmd) - 1);
_port->timeout(TIMEOUT_NORMAL);
if (size <= 0)
Expand Down Expand Up @@ -657,7 +656,7 @@ Samba::writeBuffer(uint32_t src_addr, uint32_t dst_addr, uint32_t size)
int l = snprintf((char*) cmd, sizeof(cmd), "Y%08X,0#", src_addr);
if (_port->write(cmd, l) != l)
throw SambaError();
_port->timeout(TIMEOUT_QUICK);
_port->timeout(TIMEOUT_NORMAL);
cmd[0] = 0;
_port->read(cmd, 3); // Expects "Y\n\r"
_port->timeout(TIMEOUT_NORMAL);
Expand Down