Skip to content

Commit

Permalink
disable libusb testing for now. Update version number.
Browse files Browse the repository at this point in the history
  • Loading branch information
@daharoni
daharoni committed Aug 28, 2020
1 parent f2609a2 commit d028214
Show file tree
Hide file tree
Showing 3 changed files with 96 additions and 94 deletions.
184 changes: 92 additions & 92 deletions source/backend.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,99 +63,99 @@ backEnd::backEnd(QObject *parent) :
dataSaver = new DataSaver();

// ---- LIBUSB TEST ----
libusb_device **devs;
int r;
ssize_t cnt;

r = libusb_init(NULL);
if (r < 0)
qDebug() << "Problem 1 ";
else {
cnt = libusb_get_device_list(NULL, &devs);
if (cnt < 0){
libusb_exit(NULL);
qDebug() << "Problem 2";
}
else {
// -----------
libusb_device *dev;
int i = 0, j = 0;
uint8_t path[8];

while ((dev = devs[i++]) != NULL) {
struct libusb_device_descriptor desc;
struct libusb_config_descriptor **configDesc;
const struct libusb_endpoint_descriptor *epdesc;
const struct libusb_interface_descriptor *interdesc;
int r = libusb_get_device_descriptor(dev, &desc);
if (r < 0) {
qDebug() << "failed to get device descriptor";
}
else {

qDebug() << desc.idVendor << ":" << desc.idProduct << "bus" << libusb_get_bus_number(dev) << "device" << libusb_get_device_address(dev);

r = libusb_get_port_numbers(dev, path, sizeof(path));
if (r > 0) {
qDebug() <<"path:" << path[0];
for (j = 1; j < r; j++)
qDebug() << " more paths:" << path[j];
}




libusb_device_handle *d_h = NULL;
r = libusb_open(dev,&d_h);
if ( r == 0) {
unsigned char name[200];
r = libusb_get_string_descriptor_ascii(d_h,desc.iProduct,name,200);
if ( r > 0) {
qDebug() << "name" << QString::fromUtf8((char *)name, r);
}
// libusb_set_configuration(d_h,0);
// r = libusb_get_active_config_descriptor(dev,configDesc);
// if (r < 0)
// qDebug() << "Config Desc failed:" << r;
// libusb_device **devs;
// int r;
// ssize_t cnt;

// r = libusb_init(NULL);
// if (r < 0)
// qDebug() << "Problem 1 ";
// else {
// cnt = libusb_get_device_list(NULL, &devs);
// if (cnt < 0){
// libusb_exit(NULL);
// qDebug() << "Problem 2";
// }
// else {
// // -----------
// libusb_device *dev;
// int i = 0, j = 0;
// uint8_t path[8];

// while ((dev = devs[i++]) != NULL) {
// struct libusb_device_descriptor desc;
// struct libusb_config_descriptor **configDesc;
// const struct libusb_endpoint_descriptor *epdesc;
// const struct libusb_interface_descriptor *interdesc;
// int r = libusb_get_device_descriptor(dev, &desc);
// if (r < 0) {
// qDebug() << "failed to get device descriptor";
// }
// else {

// qDebug() << desc.idVendor << ":" << desc.idProduct << "bus" << libusb_get_bus_number(dev) << "device" << libusb_get_device_address(dev);

// r = libusb_get_port_numbers(dev, path, sizeof(path));
// if (r > 0) {
// qDebug() <<"path:" << path[0];
// for (j = 1; j < r; j++)
// qDebug() << " more paths:" << path[j];
// }




// libusb_device_handle *d_h = NULL;
// r = libusb_open(dev,&d_h);
// if ( r == 0) {
// unsigned char name[200];
// r = libusb_get_string_descriptor_ascii(d_h,desc.iProduct,name,200);
// if ( r > 0) {
// qDebug() << "name" << QString::fromUtf8((char *)name, r);
// }
// // libusb_set_configuration(d_h,0);
// // r = libusb_get_active_config_descriptor(dev,configDesc);
// // if (r < 0)
// // qDebug() << "Config Desc failed:" << r;
// // else {
// // qDebug() << "Number of alt settings:" << configDesc[0]->interface->num_altsetting;
// // interdesc = configDesc[0]->interface->altsetting;

// // qDebug() << "Number of endpoints: "<< interdesc->bNumEndpoints;
// // for(int k=0; k<(int)interdesc->bNumEndpoints; k++) {
// // epdesc = &interdesc->endpoint[k];
// // qDebug()<<"Descriptor Type: "<<(int)epdesc->bDescriptorType;
// // qDebug()<<"EP Address: "<<(int)epdesc->bEndpointAddress;
// // }
// // }
// // // }
// // libusb_free_config_descriptor(configDesc[0]);

// libusb_claim_interface(d_h,2);
// uint8_t data[5] = {0,1,2,3,4};
// uint8_t inData[1024];
// int actualLength;
// qDebug() << "Sending" << data[0] << data[1] << data[2] << data[3] << data[4];
// r = libusb_bulk_transfer(d_h,0x04|LIBUSB_ENDPOINT_OUT,data,5,NULL,1000);
// if (r != 0)
// qDebug() << "Issue sending bulk transfer to device:" << r;
// else {
// qDebug() << "Number of alt settings:" << configDesc[0]->interface->num_altsetting;
// interdesc = configDesc[0]->interface->altsetting;

// qDebug() << "Number of endpoints: "<< interdesc->bNumEndpoints;
// for(int k=0; k<(int)interdesc->bNumEndpoints; k++) {
// epdesc = &interdesc->endpoint[k];
// qDebug()<<"Descriptor Type: "<<(int)epdesc->bDescriptorType;
// qDebug()<<"EP Address: "<<(int)epdesc->bEndpointAddress;
// }
// }
//// }
// libusb_free_config_descriptor(configDesc[0]);

libusb_claim_interface(d_h,2);
uint8_t data[5] = {0,1,2,3,4};
uint8_t inData[1024];
int actualLength;
qDebug() << "Sending" << data[0] << data[1] << data[2] << data[3] << data[4];
r = libusb_bulk_transfer(d_h,0x04|LIBUSB_ENDPOINT_OUT,data,5,NULL,1000);
if (r != 0)
qDebug() << "Issue sending bulk transfer to device:" << r;
else {
libusb_bulk_transfer(d_h,0x04|LIBUSB_ENDPOINT_IN ,inData,1024,&actualLength,1000);
qDebug() << "Receiving" << inData[0] << inData[1] << inData[2] << inData[3] << inData[4] << "inLength:" << actualLength;
}
libusb_close(d_h);
}
else {
qDebug() << "Open Fail:" << r;
}
}
}
// ---------------

libusb_free_device_list(devs, 1);
libusb_exit(NULL);
}
}
// libusb_bulk_transfer(d_h,0x04|LIBUSB_ENDPOINT_IN ,inData,1024,&actualLength,1000);
// qDebug() << "Receiving" << inData[0] << inData[1] << inData[2] << inData[3] << inData[4] << "inLength:" << actualLength;
// }
// libusb_close(d_h);
// }
// else {
// qDebug() << "Open Fail:" << r;
// }
// }
// }
// // ---------------

// libusb_free_device_list(devs, 1);
// libusb_exit(NULL);
// }
// }


testCodecSupport();
Expand Down
2 changes: 1 addition & 1 deletion source/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include "backend.h"

#define VERSION_NUMBER "0.171"
#define VERSION_NUMBER "0.200"
// TODO: have exit button close everything

// For Window's deployment
Expand Down
4 changes: 3 additions & 1 deletion source/miniscope.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,12 +335,14 @@ void Miniscope::configureMiniscopeControls() {
}
else { // remaining option is value is a double
controlItem->setProperty(keys[j].toLatin1().data(), values[keys[j]].toDouble());
if (keys[j] == "startValue")
if (keys[j] == "startValue") {
if (controlName[i] == "led0") { // This is used to hold initial (and last known) LED value for toggling LED on and off using remote trigger
m_lastLED0Value = values["startValue"].toDouble();
}
// sends signal on initial setup of controls
emit onPropertyChanged(m_deviceName, controlName[i], values["startValue"].toVariant());

}
}
}
}
Expand Down

0 comments on commit d028214

Please sign in to comment.