Skip to content

Commit

Permalink
Bugfix for issue 26: poll for bootloader devices, insetad of sampilng…
Browse files Browse the repository at this point in the history 
… them with a 1-shot
  • Loading branch information
@cibomahto
cibomahto committed Nov 17, 2013
1 parent 4b17a97 commit 2599875
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 83 deletions.
100 changes: 30 additions & 70 deletions animationuploader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@

#include <qDebug>

// Amount of time, in ms, to wait after resetting the device before looking for it
#define RESET_WAIT_INTERVAL 5000
/// Interval between polling the serial port list for new devices
#define WAIT_FOR_BOOTLOADER_POLL_INTERVAL 200

// Longest time, in ms, that we will wait for a signal before we cancel this process.
#define MAX_TIMER_INTERVAL 3000
/// Maximum time to wait before giving up on finding a bootloader
#define WAIT_FOR_BOOTLOADER_TIMEOUT 10000

// How long to wait between receiving notification that the programmer has been
// reset, and notifying the caller that we are finished

/// How long to wait between receiving notification that the programmer has been
/// reset, and notifying the caller that we are finished
#define PROGRAMMER_RESET_DELAY 1000

AnimationUploader::AnimationUploader(QObject *parent) :
Expand All @@ -28,8 +29,11 @@ AnimationUploader::AnimationUploader(QObject *parent) :

void AnimationUploader::handleProgrammerError(QString error) {
qCritical() << error;

// TODO: not sure if we should do this, or let the programmer handle it?
programmer.closeSerial();
if(programmer.isConnected()) {
programmer.closeSerial();
}

emit(finished(false));
}
Expand All @@ -41,6 +45,7 @@ void AnimationUploader::handleProgrammerCommandFinished(QString command, QByteAr

// we know reset is the last command, so the BlinkyTape should be ready soon.
// Schedule a timer to emit the message shortly.
// TODO: Let the receiver handle this instead.
if(command == "reset") {
QTimer::singleShot(PROGRAMMER_RESET_DELAY, this,SLOT(handleResetTimer()));
}
Expand All @@ -51,6 +56,7 @@ void AnimationUploader::handleResetTimer()
emit(finished(true));
}


void AnimationUploader::updateProgress(int newProgress) {
progress = newProgress;
emit(progressChanged(progress));
Expand Down Expand Up @@ -102,34 +108,14 @@ void AnimationUploader::startUpload(BlinkyTape& tape, QByteArray animation, int
}

/// Attempt to reset the strip using the 1200 baud rate method, and identify the newly connected bootloader
// TODO: Record the sketch and metadata somewhere so we can actually program them later!


// First, record the currently available BlinkyTapes
preResetTapes = BlinkyTape::findBlinkyTapes();

// Next, remove the currently active port from the list of available BlinkyTapes
QSerialPortInfo currentPort;
if(!tape.getPortInfo(currentPort)) {
return;
}

for(int i = 0; i < preResetTapes.length(); i++) {
if(preResetTapes.at(i).portName() == currentPort.portName()) {
preResetTapes.removeAt(i);
break;
}
}

///
// Next, tell the tape to reset.
tape.reset();

// Now, we want to wait 1 second and then start scanning to see if the port reappears
// TODO: Is one second correct?
// NOTE: Waiting to be sure that the port disappears doesn't seem to be reliable;
// we don't necessicarily get a notification about that quick enough.
// Now, start the polling processes to detect a new bootloader
stateStartTime = QDateTime::currentDateTime();
state = State_WaitForBootloaderPort;
processTimer->singleShot(RESET_WAIT_INTERVAL,this,SLOT(doWork()));
processTimer->singleShot(WAIT_FOR_BOOTLOADER_POLL_INTERVAL,this,SLOT(doWork()));
}


Expand All @@ -142,49 +128,23 @@ void AnimationUploader::doWork() {
switch(state) {
case State_WaitForBootloaderPort:
{
// RESET_WAIT_INTERVAL ms ago, we reset the BlinkyTape. It should now be in bootloader mode.
// Compare the the blinkyTapes that we have now to the previous ones. If there
// is a new one, then try to attach to it. Otherwise, stop.

// // Wait until we see a serial port appear again.
// QList<QSerialPortInfo> postResetTapes;
// bool portAdded = false;

// postResetTapes = BlinkyTape::findBlinkyTapes();
// if (postResetTapes.length() == preResetTapes.length() + 1) {
// portAdded = true;
// qCritical() << "Port added, hooray!";
// }
// if(!portAdded) {
// qCritical() << "Timeout waiting for port to appear...";
// return;
// }

// // Remove all of the tapes that are in the mid-reset list from the post-reset list
// qDebug() << "Post-reset tapes: " << postResetTapes.length();
// for(int i = 0; i < preResetTapes.length(); i++) {
// for(int j = 0; j < postResetTapes.length(); j++) {
// if(preResetTapes.at(i).portName() == postResetTapes.at(j).portName()) {
// postResetTapes.removeAt(j);
// break;
// }
// }
// }

// // Now, we should only have one new port.
// if(postResetTapes.length() != 1) {
// qCritical() << "Too many or two few ports, something went wrong??";
// return; // TODO: Fail.
// }

// Scan to see if there is a bootloader present
QList<QSerialPortInfo> postResetTapes;
postResetTapes = BlinkyTape::findBlinkyTapeBootloaders();

// Now, we should only have one new port.
// If we didn't detect a bootloader and still have time, then queue the timer and
// wait. Otherwise, we timed out, so fail.
if(postResetTapes.length() == 0) {
qCritical() << "Didn't detect a bootloader, something went wrong!";
return; // TODO: Fail.
if(stateStartTime.msecsTo(QDateTime::currentDateTime())
> WAIT_FOR_BOOTLOADER_TIMEOUT) {
handleProgrammerError("Didn't detect a bootloader, something went wrong!");
return;
}

processTimer->singleShot(WAIT_FOR_BOOTLOADER_POLL_INTERVAL,this,SLOT(doWork()));
return;
}

if(postResetTapes.length() > 1) {
qWarning() << "Too many bootloaders, something is amiss.";
}
Expand All @@ -193,7 +153,7 @@ void AnimationUploader::doWork() {

// Try to create a new programmer by connecting to the port
if(!programmer.openSerial(postResetTapes.at(0))) {
qCritical() << "could not connect to programmer!";
handleProgrammerError("could not connect to programmer!");
return;
}
else {
Expand Down
11 changes: 7 additions & 4 deletions animationuploader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,19 @@ private slots:
State_Finished,
};

/// Timer that fires
QTimer *processTimer;

float progress; // TODO: deleteme?

State state; // The state that we just completed
/// Time that we transitioned into the current state
QDateTime stateStartTime;

void updateProgress(int newProgress);
/// Current command state
State state;

/// Intermediate variables used during states
QList<QSerialPortInfo> preResetTapes; // List of BlinkyTapes existant before the target one was reset. Used as a mask.
// Update any listeners with the latest progress
void updateProgress(int newProgress);

AvrProgrammer programmer;

Expand Down
21 changes: 12 additions & 9 deletions blinkytape.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
// TODO: Support a method for loading these from preferences file
QList<QSerialPortInfo> BlinkyTape::findBlinkyTapes()
{
QList<QSerialPortInfo> serialPorts = QSerialPortInfo::availablePorts();
QList<QSerialPortInfo> tapes;

// TODO: Should we use VID/PID here instead of descriptions?
// Maybe it's not the most important thing in the world.
foreach (const QSerialPortInfo &info, QSerialPortInfo::availablePorts()) {
// Only connect to know BlinkyTapes
foreach (const QSerialPortInfo &info, serialPorts) {
qDebug() << "VID:" << info.vendorIdentifier()
<< "PID:" << info.productIdentifier();

// Only connect to known BlinkyTapes
if(info.vendorIdentifier() == BLINKYTAPE_SKETCH_VID
&& info.productIdentifier() == BLINKYTAPE_SKETCH_PID) {
tapes.push_back(info);
Expand All @@ -30,13 +32,14 @@ QList<QSerialPortInfo> BlinkyTape::findBlinkyTapes()
// TODO: Support a method for loading these from preferences file
QList<QSerialPortInfo> BlinkyTape::findBlinkyTapeBootloaders()
{
QList<QSerialPortInfo> serialPorts = QSerialPortInfo::availablePorts();
QList<QSerialPortInfo> tapes;
// TODO: Should we use VID/PID here instead of descriptions?
foreach (const QSerialPortInfo &info, QSerialPortInfo::availablePorts()) {
qDebug() << info.productIdentifier();
qDebug() << info.vendorIdentifier();

// Only connect to know BlinkyTapes
foreach (const QSerialPortInfo &info, serialPorts) {
qDebug() << "VID:" << info.vendorIdentifier()
<< "PID:" << info.productIdentifier();

// Only connect to known BlinkyTapes
if(info.vendorIdentifier() == BLINKYTAPE_BOOTLOADER_VID
&& info.productIdentifier() == BLINKYTAPE_BOOTLOADER_PID) {
tapes.push_back(info);
Expand Down

0 comments on commit 2599875

Please sign in to comment.