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

Add Greaseweazle support for firmwares 22 and 24.

Browse Source
This commit is contained in:
David Given
2021-05-23 12:01:29 +02:00
parent 7a885e23d3
commit d18e54c5a3
2 changed files with 56 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/usb/greaseweazle.h
View File

@@ -7,8 +7,6 @@
#define EP_OUT 0x02
#define EP_IN 0x83
#define GREASEWEAZLE_VERSION 24
extern Bytes fluxEngineToGreaseWeazle(const Bytes& fldata, nanoseconds_t clock);
extern Bytes greaseWeazleToFluxEngine(const Bytes& gwdata, nanoseconds_t clock);
extern Bytes stripPartialRotation(const Bytes& fldata);

76
lib/usb/greaseweazleusb.cc
View File

@@ -152,11 +152,12 @@ public:
Error() << "unable to claim interface: " << libusb_error_name(rc);
}
int version = getVersion();
if (version != GREASEWEAZLE_VERSION)
Error() << "your GreaseWeazle firmware is at version " << version
<< " but the client is for version " << GREASEWEAZLE_VERSION
<< "; please upgrade";
_version = getVersion();
if ((_version != 22) && (_version != 24))
{
Error() << "only GreaseWeazle firmware versions 22 and 24 are currently supported,"
<< " but you have version " << _version << ". Please file a bug.";
}
/* Configure the hardware. */
@@ -196,13 +197,23 @@ public:
/* The GreaseWeazle doesn't have a command to fetch the period directly,
* so we have to do a flux read. */
Bytes cmd(8);
cmd.writer()
.write_8(CMD_READ_FLUX)
.write_8(cmd.size())
.write_le32(0) //ticks default value (guessed)
.write_le32(2);//guessed
do_command(cmd);
switch (_version)
{
case 22:
do_command({ CMD_READ_FLUX, 2 });
break;
case 24:
{
Bytes cmd(8);
cmd.writer()
.write_8(CMD_READ_FLUX)
.write_8(cmd.size())
.write_le32(0) //ticks default value (guessed)
.write_le32(2);//guessed
do_command(cmd);
}
}
uint32_t ticks_gw = 0;
uint32_t firstindex = ~0;
@@ -314,14 +325,29 @@ public:
do_command({ CMD_HEAD, 3, (uint8_t)side });
switch (_version)
{
Bytes cmd(8);
cmd.writer()
.write_8(CMD_READ_FLUX)
.write_8(cmd.size())
.write_le32(0) //ticks default value (guessed)
.write_le32(revolutions + (synced ? 1 : 0));
do_command(cmd);
case 22:
{
Bytes cmd(4);
cmd.writer()
.write_8(CMD_READ_FLUX)
.write_8(cmd.size())
.write_le32(revolutions + (synced ? 1 : 0));
do_command(cmd);
break;
}
case 24:
{
Bytes cmd(8);
cmd.writer()
.write_8(CMD_READ_FLUX)
.write_8(cmd.size())
.write_le32(0) //ticks default value (guessed)
.write_le32(revolutions + (synced ? 1 : 0));
do_command(cmd);
}
}
Bytes buffer;
@@ -348,7 +374,16 @@ public:
Error() << "hard sectors are currently unsupported on the GreaseWeazel";
do_command({ CMD_HEAD, 3, (uint8_t)side });
do_command({ CMD_WRITE_FLUX, 4, 1, 1 });
switch (_version)
{
case 22:
do_command({ CMD_WRITE_FLUX, 3, 1 });
break;
case 24:
do_command({ CMD_WRITE_FLUX, 4, 1, 1 });
break;
}
write_bytes(fluxEngineToGreaseWeazle(fldata, _clock));
read_byte(); /* synchronise */
@@ -384,6 +419,7 @@ public:
{ Error() << "unsupported operation on the GreaseWeazle"; }
private:
int _version;
nanoseconds_t _clock;
nanoseconds_t _revolutions;
};