salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-31 11:17:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Treat all GreaseWeazle versions from 24 or above the same, as the USB protocol

Browse Source 
has been frozen.
This commit is contained in:
David Given
2021-07-08 10:50:31 +02:00
parent b550bbbd08
commit b2d7ba1a65
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/usb/greaseweazleusb.cc
View File

@@ -246,11 +246,15 @@ public:
{
_fd = open_serial_port(port);
_version = getVersion();
if ((_version != 22) && (_version != 24))
int version = getVersion();
if (version == 22)
_version = V22;
else if (version >= 24)
_version = V24;
else
{
Error() << "only GreaseWeazle firmware versions 22 and 24 are currently supported,"
<< " but you have version " << _version << ". Please file a bug.";
Error() << "only GreaseWeazle firmware versions 22 and 24 or above are currently "
<< "supported, but you have version " << version << ". Please file a bug.";
}
/* Configure the hardware. */
@@ -298,11 +302,11 @@ public:
switch (_version)
{
case 22:
case V22:
do_command({ CMD_READ_FLUX, 2 });
break;
case 24:
case V24:
{
Bytes cmd(8);
cmd.writer()
@@ -426,7 +430,7 @@ public:
switch (_version)
{
case 22:
case V22:
{
Bytes cmd(4);
cmd.writer()
@@ -437,7 +441,7 @@ public:
break;
}
case 24:
case V24:
{
Bytes cmd(8);
cmd.writer()
@@ -475,11 +479,11 @@ public:
do_command({ CMD_HEAD, 3, (uint8_t)side });
switch (_version)
{
case 22:
case V22:
do_command({ CMD_WRITE_FLUX, 3, 1 });
break;
case 24:
case V24:
do_command({ CMD_WRITE_FLUX, 4, 1, 1 });
break;
}
@@ -518,6 +522,12 @@ public:
{ Error() << "unsupported operation on the GreaseWeazle"; }
private:
enum
{
V22,
V24
};
FileHandle _fd;
int _version;
nanoseconds_t _clock;