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

1) update CI to add zip on commit for quick testing

Browse Source 
2) fix gw readflux command (should be 8 bytes long but was packed as 10)
3) add support for non-gw VID/PID (generic serial port that is gw compatible)
4) manually set/clear DTR on serial port devices - this seems to be essential for tinyusb/arduino CDC

not tested with a gw but ought not to have broken anything!
This commit is contained in:
lady ada
2022-01-15 20:57:36 -05:00
parent 6a07ba850c
commit 45d7b284e3
5 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/ccpp.yml vendored
View File

@@ -53,3 +53,12 @@ jobs:
run: |
make
- name: zip
run: |
zip -9 fluxengine.zip fluxengine.exe brother120tool.exe brother240tool.exe FluxEngine.cydsn/CortexM3/ARM_GCC_541/Release/FluxEngine.hex
- name: Upload build artifacts
uses: actions/upload-artifact@v2
with:
name: ${{ github.event.repository.name }}.${{ github.sha }}
path: fluxengine.zip

2
lib/usb/greaseweazleusb.cc
View File

@@ -131,7 +131,7 @@ public:
.write_8(CMD_READ_FLUX)
.write_8(cmd.size())
.write_le32(0) //ticks default value (guessed)
.write_le32(2);//guessed
.write_le16(2);//revolutions
do_command(cmd);
}
}

8
lib/usb/serial.cc
View File

@@ -46,6 +46,14 @@
commtimeouts.ReadIntervalTimeout = 100;
SetCommTimeouts(_handle, &commtimeouts);
if (!EscapeCommFunction(_handle, CLRDTR))
Error() << fmt::format("Couldn't clear DTR: {}",
get_last_error_string());
Sleep(200);
if (!EscapeCommFunction(_handle, SETDTR))
Error() << fmt::format("Couldn't set DTR: {}",
get_last_error_string());
PurgeComm(_handle, PURGE_RXABORT|PURGE_RXCLEAR|PURGE_TXABORT|PURGE_TXCLEAR);
}

4
lib/usb/usb.cc
View File

@@ -69,7 +69,9 @@ USB* get_usb_impl()
return createGreaseWeazleUsb(candidate->serialPort, config.usb().greaseweazle());
default:
Error() << "internal";
std::cerr << fmt::format("Using Unknown GW Compatible {} on {}\n", candidate->serial, candidate->serialPort);
GreaseWeazleProto gwconfig = config.usb().greaseweazle();
return createGreaseWeazleUsb(candidate->serialPort, gwconfig );
}
}

25
lib/usb/usbfinder.cc
View File

@@ -45,5 +45,30 @@ std::vector<std::unique_ptr<CandidateDevice>> findUsbDevices(const std::set<uint
}
}
if (candidates.size() == 0) {
for (const auto& it : libusbp::list_connected_devices())
{
auto candidate = std::make_unique<CandidateDevice>();
candidate->device = it;
uint32_t id = (it.get_vendor_id() << 16) | it.get_product_id();
candidate->id = id;
candidate->serial = get_serial_number(it);
printf("USB ID %04x %04x: ", it.get_vendor_id(), it.get_product_id());
try
{
libusbp::serial_port port(candidate->device, 0, true);
candidate->serialPort = port.get_name();
printf("generic serialPort found\n");
candidates.push_back(std::move(candidate));
}
catch(const libusbp::error & error)
{
// not a serial port!
printf("not a port!\n");
continue;
}
}
}
return candidates;
}