mirror of https://github.com/EspoTek/Labrador.git
Whitespace cleanup (#192)
* Fix whitespace at EOL and EOF; replace tabs * Normalize line endings
This commit is contained in:
parent
2cb3d45867
commit
1b45b0d112
|
@ -295,4 +295,3 @@ int androidUsbDriver::flashFirmware(void){
|
||||||
mainActivity.callMethod<void>("closeDevice");
|
mainActivity.callMethod<void>("closeDevice");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -81,4 +81,3 @@ void daqForm::updateValues(){
|
||||||
void daqForm::trigger_saveButtonPressed(){
|
void daqForm::trigger_saveButtonPressed(){
|
||||||
saveButtonPressed();
|
saveButtonPressed();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -25,4 +25,3 @@ unsigned char expected_variant;
|
||||||
#ifndef PLATFORM_WINDOWS
|
#ifndef PLATFORM_WINDOWS
|
||||||
struct timeval tv;
|
struct timeval tv;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -47,4 +47,3 @@ extern unsigned char expected_variant;
|
||||||
#define NUM_BYTES_STORED_PER_DAQ_SAMPLE 9
|
#define NUM_BYTES_STORED_PER_DAQ_SAMPLE 9
|
||||||
|
|
||||||
#endif // DESKTOP_SETTINGS_H
|
#endif // DESKTOP_SETTINGS_H
|
||||||
|
|
||||||
|
|
|
@ -229,4 +229,3 @@ void DualChannelController::offsetUpdate_CH2(double newOffset)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -230,7 +230,6 @@ void genericUsbDriver::sendFunctionGenData(functionGen::ChannelID channelID)
|
||||||
if(deviceMode == 5)
|
if(deviceMode == 5)
|
||||||
qDebug("DEVICE IS IN MODE 5");
|
qDebug("DEVICE IS IN MODE 5");
|
||||||
|
|
||||||
|
|
||||||
if (channelID == functionGen::ChannelID::CH2)
|
if (channelID == functionGen::ChannelID::CH2)
|
||||||
usbSendControl(0x40, 0xa1, timerPeriod, clkSetting, channelData.samples.size(), channelData.samples.data());
|
usbSendControl(0x40, 0xa1, timerPeriod, clkSetting, channelData.samples.size(), channelData.samples.data());
|
||||||
else
|
else
|
||||||
|
@ -514,4 +513,3 @@ void genericUsbDriver::checkConnection(){
|
||||||
void genericUsbDriver::bootloaderJump(){
|
void genericUsbDriver::bootloaderJump(){
|
||||||
usbSendControl(0x40, 0xa7, 1, 0, 0, NULL);
|
usbSendControl(0x40, 0xa7, 1, 0, 0, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -118,7 +118,7 @@ public:
|
||||||
// UARTS decoding
|
// UARTS decoding
|
||||||
uartStyleDecoder* m_decoder = NULL;
|
uartStyleDecoder* m_decoder = NULL;
|
||||||
bool m_isDecoding = true;
|
bool m_isDecoding = true;
|
||||||
//DFT
|
// DFT
|
||||||
AsyncDFT async_dft;
|
AsyncDFT async_dft;
|
||||||
private:
|
private:
|
||||||
// File I/O
|
// File I/O
|
||||||
|
|
|
@ -79,4 +79,3 @@ void isoBuffer_file::clearBuffer()
|
||||||
|
|
||||||
back = 0;
|
back = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -98,5 +98,3 @@ uint32_t isoBufferBuffer::capacity() const
|
||||||
{
|
{
|
||||||
return m_capacity;
|
return m_capacity;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1658,4 +1658,3 @@ void isoDriver::setMaxSpectrum(int maxSpectrum)
|
||||||
{
|
{
|
||||||
m_spectrumMaxX = static_cast<double>(maxSpectrum);
|
m_spectrumMaxX = static_cast<double>(maxSpectrum);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2473,7 +2473,6 @@ void MainWindow::cursorGroupEnabled(bool enabled)
|
||||||
ui->makeCursorsNicer->setTurnedOn(false);
|
ui->makeCursorsNicer->setTurnedOn(false);
|
||||||
ui->cursorGroup->setEnabled(false);
|
ui->cursorGroup->setEnabled(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::on_actionHide_Widget_Oscilloscope_triggered(bool checked)
|
void MainWindow::on_actionHide_Widget_Oscilloscope_triggered(bool checked)
|
||||||
|
|
|
@ -90,4 +90,3 @@ void scopeRangeEnterDialog::delayChanged(double val)
|
||||||
{
|
{
|
||||||
ui->delayBox->setValue(val);
|
ui->delayBox->setValue(val);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -257,4 +257,3 @@ UartParity uartStyleDecoder::parityOf(uint32_t bitField) const
|
||||||
|
|
||||||
return result ? UartParity::Odd : UartParity::Even;
|
return result ? UartParity::Odd : UartParity::Even;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -254,4 +254,3 @@ void bufferControl::poke(void){
|
||||||
updateMode();
|
updateMode();
|
||||||
updateBuffer(0,0);
|
updateBuffer(0,0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -103,4 +103,3 @@ void espoSlider::poke(void){
|
||||||
//qDebug() << "Refreshing to voltage" << ((double) (this->value())) / 20;
|
//qDebug() << "Refreshing to voltage" << ((double) (this->value())) / 20;
|
||||||
voltageChanged(((double) (this->value())) / 20);
|
voltageChanged(((double) (this->value())) / 20);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -57,4 +57,3 @@ void swipeyStack::cycleStack(int delta){
|
||||||
void swipeyStack::enableWrapping(bool enabled){
|
void swipeyStack::enableWrapping(bool enabled){
|
||||||
wrapEnabled = enabled;
|
wrapEnabled = enabled;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue