Removed dead code and added a Mac OS X read me file.
I had left some old code when I was changing the communication scheme around, so I removed it. It was just commented out and taking up space. I also added a read me file for Mac OS X users to explain the USB CDC modem popup message.
This commit is contained in:
parent
6ceea8c22d
commit
7a2bfdf2fc
|
@ -0,0 +1,14 @@
|
||||||
|
-------------------------------------------------------------------------------
|
||||||
|
Important notice for Mac OS X users:
|
||||||
|
-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
When you first plug the programmer board into your computer, Mac OS X will
|
||||||
|
probably bring up a window telling you that a new network interface has been
|
||||||
|
detected. This message will perpetually annoy you unless you go into the
|
||||||
|
Network System Preferences and click "Apply" to add the programmer board as a
|
||||||
|
network interface.
|
||||||
|
|
||||||
|
The reason it does this is because the programmer board identifies itself to
|
||||||
|
computers as a USB CDC class modem, which is basically a serial port simulated
|
||||||
|
over USB that doesn't require drivers in Mac OS X and Linux. The drawback of
|
||||||
|
this approach is that Mac OS X thinks it is a modem.
|
|
@ -72,35 +72,6 @@ MainWindow::MainWindow(QWidget *parent) :
|
||||||
connect(p, SIGNAL(programmerBoardDisconnected()), SLOT(programmerBoardDisconnected()));
|
connect(p, SIGNAL(programmerBoardDisconnected()), SLOT(programmerBoardDisconnected()));
|
||||||
connect(p, SIGNAL(programmerBoardDisconnectedDuringOperation()), SLOT(programmerBoardDisconnectedDuringOperation()));
|
connect(p, SIGNAL(programmerBoardDisconnectedDuringOperation()), SLOT(programmerBoardDisconnectedDuringOperation()));
|
||||||
p->startCheckingPorts();
|
p->startCheckingPorts();
|
||||||
|
|
||||||
/*QList<QextPortInfo> l = QextSerialEnumerator::getPorts();
|
|
||||||
foreach (QextPortInfo p, l)
|
|
||||||
{
|
|
||||||
qDebug() << "Found port...";
|
|
||||||
qDebug() << "Enum name:" << p.enumName;
|
|
||||||
qDebug() << "Friend name:" << p.friendName;
|
|
||||||
qDebug() << "Phys name:" << p.physName;
|
|
||||||
qDebug() << "Port name:" << p.portName;
|
|
||||||
qDebug() << "Product ID:" << hex << p.productID;
|
|
||||||
qDebug() << "Vendor ID:" << hex << p.vendorID;
|
|
||||||
qDebug() << "";
|
|
||||||
|
|
||||||
#ifdef Q_WS_WIN
|
|
||||||
if (p.portName.startsWith("COM"))
|
|
||||||
#endif
|
|
||||||
{
|
|
||||||
// TODO: Do checking for valid USB ID?
|
|
||||||
|
|
||||||
if ((p.vendorID == 0x03EB) && (p.productID == 0x204B))
|
|
||||||
{
|
|
||||||
ui->portList->addItem(QString("%1 (Programmer)").arg(p.portName), QVariant(p.portName));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
ui->portList->addItem(p.portName, QVariant(p.portName));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
MainWindow::~MainWindow()
|
MainWindow::~MainWindow()
|
||||||
|
@ -662,7 +633,6 @@ void MainWindow::programmerBoardDisconnectedDuringOperation()
|
||||||
|
|
||||||
void MainWindow::resetAndShowStatusPage()
|
void MainWindow::resetAndShowStatusPage()
|
||||||
{
|
{
|
||||||
//ui->progressBar->setValue(0);
|
|
||||||
// Show indeterminate progress bar until communication succeeds/fails
|
// Show indeterminate progress bar until communication succeeds/fails
|
||||||
ui->progressBar->setRange(0, 0);
|
ui->progressBar->setRange(0, 0);
|
||||||
ui->statusLabel->setText("Communicating with programmer (this may take a few seconds)...");
|
ui->statusLabel->setText("Communicating with programmer (this may take a few seconds)...");
|
||||||
|
|
|
@ -181,11 +181,6 @@ Programmer::~Programmer()
|
||||||
|
|
||||||
void Programmer::readSIMM(QIODevice *device)
|
void Programmer::readSIMM(QIODevice *device)
|
||||||
{
|
{
|
||||||
//readFile = new QFile(filename);
|
|
||||||
//readFile->open(QFile::WriteOnly);
|
|
||||||
//lenRead = 0;
|
|
||||||
//lenRemaining = _simmCapacity;
|
|
||||||
|
|
||||||
readDevice = device;
|
readDevice = device;
|
||||||
lenRead = 0;
|
lenRead = 0;
|
||||||
lenRemaining = _simmCapacity;
|
lenRemaining = _simmCapacity;
|
||||||
|
@ -195,27 +190,6 @@ void Programmer::readSIMM(QIODevice *device)
|
||||||
|
|
||||||
void Programmer::writeToSIMM(QIODevice *device)
|
void Programmer::writeToSIMM(QIODevice *device)
|
||||||
{
|
{
|
||||||
/*writeFile = new QFile(filename);
|
|
||||||
if (!writeFile->open(QFile::ReadOnly))
|
|
||||||
{
|
|
||||||
curState = WaitingForNextCommand;
|
|
||||||
emit writeStatusChanged(WriteError);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (writeFile->size() > _simmCapacity)
|
|
||||||
{
|
|
||||||
curState = WaitingForNextCommand;
|
|
||||||
emit writeStatusChanged(WriteFileTooBig);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
lenWritten = 0;
|
|
||||||
writeLenRemaining = writeFile->size();
|
|
||||||
|
|
||||||
startProgrammerCommand(EraseChips, WriteSIMMWaitingEraseReply);
|
|
||||||
}*/
|
|
||||||
|
|
||||||
writeDevice = device;
|
writeDevice = device;
|
||||||
if (writeDevice->size() > _simmCapacity)
|
if (writeDevice->size() > _simmCapacity)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue