mirrors
/
Labrador
mirror of https://github.com/EspoTek/Labrador.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some scaffolding for MATLAB code.

This commit is contained in:
Chris Esposito 2018-04-26 14:50:17 +10:00
parent 83bc540fe6
commit 264838c6e3
28 changed files with 200 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -46,3 +46,7 @@ Matlab_Octave_API/___librador/build-librador-Desktop_Qt_5_10_0_GCC_64bit-Debug
Matlab_Octave_API/___librador/demo/librademo/Makefile
Matlab_Octave_API/___librador/demo/librademo/librademo
*.mex
Librador_API/___librador/MATLAB_Octave/octave-workspace

9
Librador_API/___librador/MATLAB_Octave/C/librador_compile.m Normal file
View File

@ -0,0 +1,9 @@
function [] = librador_compile(fname_no_dot_cpp, idename)
fprintf("\n\n\nCompiling %s.cpp...\n\n\n", fname_no_dot_cpp);
fflush(stdout);
mex(['-DCOMPILE_FOR_' idename], '-I../../../Desktop_Interface/build_linux/libusb', '-I../librador_shared_library', '-lrador', '-L../librador_shared_library', ['C/mexsrc/' fname_no_dot_cpp '.cpp'])
copyfile([fname_no_dot_cpp '.mex'], 'C/mex_outputs')
delete([fname_no_dot_cpp '.mex'])
copyfile([fname_no_dot_cpp '.o'], 'C/mex_outputs')
delete([fname_no_dot_cpp '.o'])
return;

45
Librador_API/___librador/MATLAB_Octave/C/mexsrc/Thread_Example.c Normal file
View File

@ -0,0 +1,45 @@
//MATLAB INCLUDES
#ifdef COMPILE_FOR_OCTAVE
#define USING_OCTAVE 1
#elif defined COMPILE_FOR_MATLAB
#define USING_OCTAVE 0
#else
#error "IDE not defined. Please add -DCOMPILE_FOR_MATLAB to your mex call if you use MATLAB, or -DCOMPILE_FOR_OCTAVE if using GNU Octave."
#endif
#if !USING_OCTAVE
#include <matrix.h>
#endif
#include <mex.h>
//LIBUSB INCLUDES
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
#include "libusb.h"
//MISC INCLUDES
#include <math.h>
#include <string.h>
#include <unistd.h>
//https://undocumentedmatlab.com/blog/explicit-multi-threading-in-matlab-part3
//Yair, you're a genius.
void *thread_run(void *p)
{
while(1){
mexPrintf("Thread Running\n");
usleep(1000000);
}
}
void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
{
pthread_t thread;
if (pthread_create(&thread, NULL, thread_run, NULL))
mexErrMsgIdAndTxt("YMA:MexIO:threadFailed", "Thread creation failed");
return;
}

38
Librador_API/___librador/MATLAB_Octave/C/mexsrc/matlab_octave_api_librador_init.cpp Normal file
View File

@ -0,0 +1,38 @@
//MATLAB INCLUDES
#ifdef COMPILE_FOR_OCTAVE
#define USING_OCTAVE 1
#elif defined COMPILE_FOR_MATLAB
#define USING_OCTAVE 0
#else
#error "IDE not defined. Please add -DCOMPILE_FOR_MATLAB to your mex call if you use MATLAB, or -DCOMPILE_FOR_OCTAVE if using GNU Octave."
#endif
#if !USING_OCTAVE
#include <matrix.h>
#endif
#include <mex.h>
//LIBRADOR INCLUDES
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
#include "libusb.h"
#include "librador.h"
//MISC INCLUDES
#include <math.h>
#include <string.h>
#include <unistd.h>
void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
{
//I/O
int *ptr_return_value;
//Malloc all the vars!
ptr_return_value = (int *) calloc(1, sizeof(int));
ptr_return_value[0] = librador_init();
plhs[0] = mxCreateDoubleScalar(ptr_return_value[0]);
}

12
Librador_API/___librador/MATLAB_Octave/C/recompile.m Normal file
View File

@ -0,0 +1,12 @@
clc
fprintf("\n\n\nCompiling Thread_Example...\n\n\n");
fflush(stdout);
mex C/mexsrc/Thread_Example.c -I../../../Desktop_Interface/build_linux/libusb -lusb-1.0 -Lbin\lib\x64 -DCOMPILE_FOR_OCTAVE
fprintf("Moving Thread_Example...\n");
copyfile Thread_Example.mex C/mex_outputs;
copyfile Thread_Example.o C/mex_outputs;
delete Thread_Example.mex;
delete Thread_Example.o;
librador_compile('matlab_octave_api_librador_init', 'OCTAVE')

56
Librador_API/___librador/MATLAB_Octave/___main.m
View File

@ -0,0 +1,56 @@
clear all
clc
__addpaths
%
%int LIBRADORSHARED_EXPORT librador_init();
%int LIBRADORSHARED_EXPORT librador_exit();
%int LIBRADORSHARED_EXPORT librador_setup_usb();
%int LIBRADORSHARED_EXPORT librador_reset_usb();
%//Control
%//a0
%int LIBRADORSHARED_EXPORT librador_avr_debug();
%//a1
%int LIBRADORSHARED_EXPORT librador_update_signal_gen_settings(int channel, unsigned char* sampleBuffer, int numSamples, double usecs_between_samples, double amplitude_v, double offset_v);
%int LIBRADORSHARED_EXPORT librador_send_sin_wave(int channel, double frequency_Hz, double amplitude_v, double offset_v);
%int LIBRADORSHARED_EXPORT librador_send_square_wave(int channel, double frequency_Hz, double amplitude_v, double offset_v);
%int LIBRADORSHARED_EXPORT librador_send_sawtooth_wave(int channel, double frequency_Hz, double amplitude_v, double offset_v);
%int LIBRADORSHARED_EXPORT librador_send_triangle_wave(int channel, double frequency_Hz, double amplitude_v, double offset_v);
%//a2
%////As above
%//a3
%int LIBRADORSHARED_EXPORT librador_set_power_supply_voltage(double voltage);
%//a4
%///As above, a1 and a2
%//a5
%int LIBRADORSHARED_EXPORT librador_set_device_mode(int mode);
%int LIBRADORSHARED_EXPORT librador_set_oscilloscope_gain(double gain);
%//a6
%int LIBRADORSHARED_EXPORT librador_set_digital_out(int channel, bool state_on);
%//a7
%int LIBRADORSHARED_EXPORT librador_reset_device();
%int LIBRADORSHARED_EXPORT librador_jump_to_bootloader();
%//a8
%uint16_t LIBRADORSHARED_EXPORT librador_get_device_firmware_version();
%//a9
%uint8_t LIBRADORSHARED_EXPORT librador_get_device_firmware_variant();
%//aa
%//int LIBRADORSHARED_EXPORT librador_kickstart_isochronous_loop();
%
%std::vector<double> * LIBRADORSHARED_EXPORT librador_get_analog_data(int channel, double timeWindow_seconds, double sample_rate_hz, double delay_seconds, int filter_mode);
%std::vector<double> * LIBRADORSHARED_EXPORT librador_get_analog_data_sincelast(int channel, double timeWindow_max_seconds, double sample_rate_hz, double delay_seconds, int filter_mode);
%std::vector<uint8_t> * librador_get_digital_data(int channel, double timeWindow_seconds, double sample_rate_hz, double delay_seconds);
%
%//TODO: flashFirmware();
%
%
%/*
% * Should never be unsynchronised... Hide these ones
%int LIBRADORSHARED_EXPORT librador_synchronise_begin();
%int LIBRADORSHARED_EXPORT librador_synchronise_end();
%*/
%
%
%#endif // LIBRADOR_H

5
Librador_API/___librador/MATLAB_Octave/__addpaths.m Normal file
View File

@ -0,0 +1,5 @@
addpath C
addpath C/mex_outputs
addpath C/mexsrc
addpath mex_wrappers
addpath other_scripts

52
Librador_API/___librador/demo/librademo/Makefile → Librador_API/___librador/demo_qt/librademo/Makefile
View File

@ -15,7 +15,7 @@ CXX = g++
DEFINES = -DQT_DEPRECATED_WARNINGS -DPLATFORM_LINUX -DQT_NO_DEBUG -DQT_PRINTSUPPORT_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
CFLAGS = -pipe -O2 -Wall -W -D_REENTRANT -fPIC $(DEFINES)
CXXFLAGS = -pipe -O2 -std=gnu++11 -Wall -W -D_REENTRANT -fPIC $(DEFINES)
INCPATH = -I. -I../../../../Desktop_Interface/ui_elements/qcp1 -I../../librador -I../../../../Desktop_Interface/build_linux/libusb -I../../../../Desktop_Interface/build_linux/libdfuprog/include -I/home/esposch/Qt/5.10.0/gcc_64/include -I/home/esposch/Qt/5.10.0/gcc_64/include/QtPrintSupport -I/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets -I/home/esposch/Qt/5.10.0/gcc_64/include/QtGui -I/home/esposch/Qt/5.10.0/gcc_64/include/QtCore -I. -isystem /usr/include/libdrm -I. -I/home/esposch/Qt/5.10.0/gcc_64/mkspecs/linux-g++
INCPATH = -I. -I../../../../Desktop_Interface/ui_elements/qcp1 -I../../librador_shared_library -I../../../../Desktop_Interface/build_linux/libusb -I../../../../Desktop_Interface/build_linux/libdfuprog/include -I/home/esposch/Qt/5.10.0/gcc_64/include -I/home/esposch/Qt/5.10.0/gcc_64/include/QtPrintSupport -I/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets -I/home/esposch/Qt/5.10.0/gcc_64/include/QtGui -I/home/esposch/Qt/5.10.0/gcc_64/include/QtCore -I. -isystem /usr/include/libdrm -I. -I/home/esposch/Qt/5.10.0/gcc_64/mkspecs/linux-g++
QMAKE = /home/esposch/Qt/5.10.0/gcc_64/bin/qmake
DEL_FILE = rm -f
CHK_DIR_EXISTS= test -d
@ -35,10 +35,10 @@ MOVE = mv -f
TAR = tar -cf
COMPRESS = gzip -9f
DISTNAME = librademo1.0.0
DISTDIR = /home/esposch/Git/Labrador/Matlab_Octave_API/___librador/demo/librademo/.tmp/librademo1.0.0
DISTDIR = /home/esposch/Git/Labrador/Librador_API/___librador/demo_qt/librademo/.tmp/librademo1.0.0
LINK = g++
LFLAGS = -Wl,-O1 -Wl,-rpath,/home/esposch/Qt/5.10.0/gcc_64/lib
LIBS = $(SUBLIBS) -L../../librador/ -lrador -L../../../../Desktop_Interface/build_linux/libusb -lusb-1.0 -L../../../../Desktop_Interface/build_linux/libdfuprog/lib/x64 -ldfuprog-0.9 -L/home/esposch/Qt/5.10.0/gcc_64/lib -lQt5PrintSupport -lQt5Widgets -lQt5Gui -lQt5Core -lGL -lpthread
LIBS = $(SUBLIBS) -L../../librador_shared_library -lrador -L../../../../Desktop_Interface/build_linux/libusb -lusb-1.0 -L../../../../Desktop_Interface/build_linux/libdfuprog/lib/x64 -ldfuprog-0.9 -L/home/esposch/Qt/5.10.0/gcc_64/lib -lQt5PrintSupport -lQt5Widgets -lQt5Gui -lQt5Core -lGL -lpthread
AR = ar cqs
RANLIB =
SED = sed
@ -792,7 +792,7 @@ moc_mainwindow.cpp: /home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/QMainWindow
mainwindow.h \
moc_predefs.h \
/home/esposch/Qt/5.10.0/gcc_64/bin/moc
/home/esposch/Qt/5.10.0/gcc_64/bin/moc $(DEFINES) --include ./moc_predefs.h -I/home/esposch/Qt/5.10.0/gcc_64/mkspecs/linux-g++ -I/home/esposch/Git/Labrador/Matlab_Octave_API/___librador/demo/librademo -I/home/esposch/Git/Labrador/Desktop_Interface/ui_elements/qcp1 -I/home/esposch/Git/Labrador/Matlab_Octave_API/___librador/librador -I/home/esposch/Git/Labrador/Desktop_Interface/build_linux/libusb -I/home/esposch/Git/Labrador/Desktop_Interface/build_linux/libdfuprog/include -I/home/esposch/Qt/5.10.0/gcc_64/include -I/home/esposch/Qt/5.10.0/gcc_64/include/QtPrintSupport -I/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets -I/home/esposch/Qt/5.10.0/gcc_64/include/QtGui -I/home/esposch/Qt/5.10.0/gcc_64/include/QtCore -I/usr/include/c++/5 -I/usr/include/x86_64-linux-gnu/c++/5 -I/usr/include/c++/5/backward -I/usr/lib/gcc/x86_64-linux-gnu/5/include -I/usr/local/include -I/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed -I/usr/include/x86_64-linux-gnu -I/usr/include mainwindow.h -o moc_mainwindow.cpp
/home/esposch/Qt/5.10.0/gcc_64/bin/moc $(DEFINES) --include ./moc_predefs.h -I/home/esposch/Qt/5.10.0/gcc_64/mkspecs/linux-g++ -I/home/esposch/Git/Labrador/Librador_API/___librador/demo_qt/librademo -I/home/esposch/Git/Labrador/Desktop_Interface/ui_elements/qcp1 -I/home/esposch/Git/Labrador/Librador_API/___librador/librador_shared_library -I/home/esposch/Git/Labrador/Desktop_Interface/build_linux/libusb -I/home/esposch/Git/Labrador/Desktop_Interface/build_linux/libdfuprog/include -I/home/esposch/Qt/5.10.0/gcc_64/include -I/home/esposch/Qt/5.10.0/gcc_64/include/QtPrintSupport -I/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets -I/home/esposch/Qt/5.10.0/gcc_64/include/QtGui -I/home/esposch/Qt/5.10.0/gcc_64/include/QtCore -I/usr/include/c++/5 -I/usr/include/x86_64-linux-gnu/c++/5 -I/usr/include/c++/5/backward -I/usr/lib/gcc/x86_64-linux-gnu/5/include -I/usr/local/include -I/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed -I/usr/include/x86_64-linux-gnu -I/usr/include mainwindow.h -o moc_mainwindow.cpp
moc_qcustomplot.cpp: /home/esposch/Qt/5.10.0/gcc_64/include/QtCore/QObject \
/home/esposch/Qt/5.10.0/gcc_64/include/QtCore/qobject.h \
@ -1280,7 +1280,7 @@ moc_qcustomplot.cpp: /home/esposch/Qt/5.10.0/gcc_64/include/QtCore/QObject \
../../../../Desktop_Interface/ui_elements/qcp1/qcustomplot.h \
moc_predefs.h \
/home/esposch/Qt/5.10.0/gcc_64/bin/moc
/home/esposch/Qt/5.10.0/gcc_64/bin/moc $(DEFINES) --include ./moc_predefs.h -I/home/esposch/Qt/5.10.0/gcc_64/mkspecs/linux-g++ -I/home/esposch/Git/Labrador/Matlab_Octave_API/___librador/demo/librademo -I/home/esposch/Git/Labrador/Desktop_Interface/ui_elements/qcp1 -I/home/esposch/Git/Labrador/Matlab_Octave_API/___librador/librador -I/home/esposch/Git/Labrador/Desktop_Interface/build_linux/libusb -I/home/esposch/Git/Labrador/Desktop_Interface/build_linux/libdfuprog/include -I/home/esposch/Qt/5.10.0/gcc_64/include -I/home/esposch/Qt/5.10.0/gcc_64/include/QtPrintSupport -I/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets -I/home/esposch/Qt/5.10.0/gcc_64/include/QtGui -I/home/esposch/Qt/5.10.0/gcc_64/include/QtCore -I/usr/include/c++/5 -I/usr/include/x86_64-linux-gnu/c++/5 -I/usr/include/c++/5/backward -I/usr/lib/gcc/x86_64-linux-gnu/5/include -I/usr/local/include -I/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed -I/usr/include/x86_64-linux-gnu -I/usr/include ../../../../Desktop_Interface/ui_elements/qcp1/qcustomplot.h -o moc_qcustomplot.cpp
/home/esposch/Qt/5.10.0/gcc_64/bin/moc $(DEFINES) --include ./moc_predefs.h -I/home/esposch/Qt/5.10.0/gcc_64/mkspecs/linux-g++ -I/home/esposch/Git/Labrador/Librador_API/___librador/demo_qt/librademo -I/home/esposch/Git/Labrador/Desktop_Interface/ui_elements/qcp1 -I/home/esposch/Git/Labrador/Librador_API/___librador/librador_shared_library -I/home/esposch/Git/Labrador/Desktop_Interface/build_linux/libusb -I/home/esposch/Git/Labrador/Desktop_Interface/build_linux/libdfuprog/include -I/home/esposch/Qt/5.10.0/gcc_64/include -I/home/esposch/Qt/5.10.0/gcc_64/include/QtPrintSupport -I/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets -I/home/esposch/Qt/5.10.0/gcc_64/include/QtGui -I/home/esposch/Qt/5.10.0/gcc_64/include/QtCore -I/usr/include/c++/5 -I/usr/include/x86_64-linux-gnu/c++/5 -I/usr/include/c++/5/backward -I/usr/lib/gcc/x86_64-linux-gnu/5/include -I/usr/local/include -I/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed -I/usr/include/x86_64-linux-gnu -I/usr/include ../../../../Desktop_Interface/ui_elements/qcp1/qcustomplot.h -o moc_qcustomplot.cpp
compiler_moc_objc_header_make_all:
compiler_moc_objc_header_clean:
@ -2024,18 +2024,11 @@ mainwindow.o: mainwindow.cpp mainwindow.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtGui/qinputmethod.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/QButtonGroup \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qbuttongroup.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/QHBoxLayout \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qboxlayout.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qlayout.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qlayoutitem.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qgridlayout.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/QHeaderView \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qheaderview.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qabstractitemview.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qabstractscrollarea.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qframe.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtCore/qabstractitemmodel.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtCore/qitemselectionmodel.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/QCheckBox \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qcheckbox.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qabstractbutton.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/QComboBox \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qcombobox.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qabstractitemdelegate.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qstyleoption.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qabstractspinbox.h \
@ -2046,12 +2039,27 @@ mainwindow.o: mainwindow.cpp mainwindow.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qstyle.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qtabbar.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qrubberband.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qframe.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtCore/qabstractitemmodel.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/QDoubleSpinBox \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qspinbox.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/QHBoxLayout \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qboxlayout.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qlayout.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qlayoutitem.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qgridlayout.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/QHeaderView \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qheaderview.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qabstractitemview.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qabstractscrollarea.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtCore/qitemselectionmodel.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/QLabel \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qlabel.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/QMenuBar \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qmenubar.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qmenu.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/QPushButton \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qpushbutton.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qabstractbutton.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/QStatusBar \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qstatusbar.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/QToolBar \
@ -2292,12 +2300,10 @@ mainwindow.o: mainwindow.cpp mainwindow.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/QtWidgetsDepends \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qaccessiblewidget.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qcalendarwidget.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qcheckbox.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qcolordialog.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qdialog.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qcolormap.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qcolumnview.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qcombobox.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qcommandlinkbutton.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qcommonstyle.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qcompleter.h \
@ -2342,7 +2348,6 @@ mainwindow.o: mainwindow.cpp mainwindow.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qitemeditorfactory.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qkeyeventtransition.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qkeysequenceedit.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qlabel.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qlcdnumber.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qlistview.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qlistwidget.h \
@ -2366,7 +2371,6 @@ mainwindow.o: mainwindow.cpp mainwindow.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtCore/QMetaType \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qshortcut.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qsizegrip.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qspinbox.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qsplashscreen.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qsplitter.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtWidgets/qstackedlayout.h \
@ -2400,8 +2404,8 @@ mainwindow.o: mainwindow.cpp mainwindow.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtPrintSupport/qprintpreviewdialog.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtPrintSupport/qprintpreviewwidget.h \
/home/esposch/Qt/5.10.0/gcc_64/include/QtPrintSupport/qtprintsupportversion.h \
../../librador/librador.h \
../../librador/librador_global.h
../../librador_shared_library/librador.h \
../../librador_shared_library/librador_global.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o mainwindow.cpp
qcustomplot.o: ../../../../Desktop_Interface/ui_elements/qcp1/qcustomplot.cpp ../../../../Desktop_Interface/ui_elements/qcp1/qcustomplot.h \

0
Librador_API/___librador/demo/librademo/librademo → Librador_API/___librador/demo_qt/librademo/librademo
View File

7
Librador_API/___librador/demo/librademo/librademo.pro → Librador_API/___librador/demo_qt/librademo/librademo.pro
View File

@ -41,9 +41,9 @@ FORMS += \
mainwindow.ui
unix:LIBS += -L../../librador/ -lrador
unix:INCLUDEPATH += ../../librador
unix:DEPENDPATH += ../../librador
unix:LIBS += -L../../librador_shared_library -lrador
unix:INCLUDEPATH += ../../librador_shared_library
unix:DEPENDPATH += ../../librador_shared_library
unix:!android:!macx {
#libusb include
@ -60,4 +60,3 @@ unix:!android:!macx {
DEFINES += \
PLATFORM_LINUX \
}

0
Librador_API/___librador/demo/librademo/main.cpp → Librador_API/___librador/demo_qt/librademo/main.cpp
View File

0
Librador_API/___librador/demo/librademo/mainwindow.cpp → Librador_API/___librador/demo_qt/librademo/mainwindow.cpp
View File

0
Librador_API/___librador/demo/librademo/mainwindow.h → Librador_API/___librador/demo_qt/librademo/mainwindow.h
View File

0
Librador_API/___librador/demo/librademo/mainwindow.ui → Librador_API/___librador/demo_qt/librademo/mainwindow.ui
View File

0
Librador_API/___librador/demo/librademo/moc_mainwindow.cpp → Librador_API/___librador/demo_qt/librademo/moc_mainwindow.cpp
View File

0
Librador_API/___librador/demo/librademo/moc_predefs.h → Librador_API/___librador/demo_qt/librademo/moc_predefs.h
View File

0
Librador_API/___librador/demo/librademo/moc_qcustomplot.cpp → Librador_API/___librador/demo_qt/librademo/moc_qcustomplot.cpp
View File

0
Librador_API/___librador/demo/librademo/ui_mainwindow.h → Librador_API/___librador/demo_qt/librademo/ui_mainwindow.h
View File

0
Librador_API/___librador/librador/Makefile → Librador_API/___librador/librador_shared_library/Makefile
View File

0
Librador_API/___librador/librador/librador.cpp → Librador_API/___librador/librador_shared_library/librador.cpp
View File

0
Librador_API/___librador/librador/librador.h → Librador_API/___librador/librador_shared_library/librador.h
View File

0
Librador_API/___librador/librador/librador.pro → Librador_API/___librador/librador_shared_library/librador.pro
View File

0
Librador_API/___librador/librador/librador_global.h → Librador_API/___librador/librador_shared_library/librador_global.h
View File

0
Librador_API/___librador/librador/librador_internal.h → Librador_API/___librador/librador_shared_library/librador_internal.h
View File

0
Librador_API/___librador/librador/o1buffer.cpp → Librador_API/___librador/librador_shared_library/o1buffer.cpp
View File

0
Librador_API/___librador/librador/o1buffer.h → Librador_API/___librador/librador_shared_library/o1buffer.h
View File

0
Librador_API/___librador/librador/usbcallhandler.cpp → Librador_API/___librador/librador_shared_library/usbcallhandler.cpp
View File

0
Librador_API/___librador/librador/usbcallhandler.h → Librador_API/___librador/librador_shared_library/usbcallhandler.h
View File