Skip to content

Commit

Permalink
Bugfixes: -
Browse files Browse the repository at this point in the history
New: Clean-up
ToDo: bugfixes & increase speed
  • Loading branch information
lj committed Feb 12, 2018
1 parent 26b1ef4 commit db809bb
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 26 deletions.
14 changes: 7 additions & 7 deletions SigrokLcd.depend
Original file line number Diff line number Diff line change
Expand Up @@ -957,7 +957,7 @@

1474332885 /usr/include/wx-2.8/wx/gtk/stattext.h

1518099401 /usr/local/include/libsigrokcxx/libsigrokcxx.hpp
1518431717 /usr/local/include/libsigrokcxx/libsigrokcxx.hpp
<libsigrok/libsigrok.h>
<glibmm.h>
<stdexcept>
Expand All @@ -967,7 +967,7 @@
<set>
<libsigrokcxx/enums.hpp>

1518099401 /usr/local/include/libsigrok/libsigrok.h
1518431717 /usr/local/include/libsigrok/libsigrok.h
<stdio.h>
<sys/time.h>
<stdint.h>
Expand Down Expand Up @@ -1332,9 +1332,9 @@

1499987019 /usr/include/glib-2.0/glib/glib-autocleanups.h

1518099401 /usr/local/include/libsigrok/proto.h
1518431717 /usr/local/include/libsigrok/proto.h

1518099401 /usr/local/include/libsigrok/version.h
1518431718 /usr/local/include/libsigrok/version.h

1504102410 /usr/include/glibmm-2.4/glibmm.h
<glibmmconfig.h>
Expand Down Expand Up @@ -2051,7 +2051,7 @@
<type_traits>
<utility>

1518099401 /usr/local/include/libsigrokcxx/enums.hpp
1518431717 /usr/local/include/libsigrokcxx/enums.hpp

1474332885 /usr/include/wx-2.8/wx/textctrl.h
"wx/defs.h"
Expand Down Expand Up @@ -4246,7 +4246,7 @@

1504064262 /usr/include/wx-3.0/wx/gtk/app.h

1518092511 /home/lj/git-repos/SigrokLCD/SigrokLcdMain.h
1518425384 /home/lj/git-repos/SigrokLCD/SigrokLcdMain.h
<libsigrokcxx/libsigrokcxx.hpp>
"lcdwindow.h"
"led.h"
Expand Down Expand Up @@ -4375,7 +4375,7 @@

1504064262 /usr/include/wx-3.0/wx/gtk/menu.h

1518099690 source:/home/lj/git-repos/SigrokLCD/SigrokLcdMain.cpp
1518431358 source:/home/lj/git-repos/SigrokLCD/SigrokLcdMain.cpp
"SigrokLcdMain.h"
<wx/msgdlg.h>
<wx/intl.h>
Expand Down
24 changes: 12 additions & 12 deletions SigrokLcd.layout
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,34 @@
<CodeBlocks_layout_file>
<FileVersion major="1" minor="0" />
<ActiveTarget name="Debug" />
<File name="SigrokLcdMain.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="SigrokLcdMain.cpp" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1848" topLine="60" />
<Cursor1 position="8251" topLine="245" />
</Cursor>
</File>
<File name="lcdwindow.cpp" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="SigrokLcdApp.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="355" topLine="78" />
<Cursor1 position="444" topLine="0" />
</Cursor>
</File>
<File name="SigrokLcdApp.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="SigrokLcdApp.cpp" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="444" topLine="0" />
<Cursor1 position="371" topLine="6" />
</Cursor>
</File>
<File name="led.cpp" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="SigrokLcdMain.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="2195" topLine="52" />
<Cursor1 position="1848" topLine="45" />
</Cursor>
</File>
<File name="SigrokLcdMain.cpp" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="led.cpp" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="8363" topLine="209" />
<Cursor1 position="2195" topLine="52" />
</Cursor>
</File>
<File name="SigrokLcdApp.cpp" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="lcdwindow.cpp" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="371" topLine="6" />
<Cursor1 position="355" topLine="78" />
</Cursor>
</File>
</CodeBlocks_layout_file>
7 changes: 0 additions & 7 deletions SigrokLcdMain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -225,13 +225,6 @@ void SigrokLcdFrame::RefreshParameters(wxKeyEvent& event)
{
hwDev->config_set(sigrok::ConfigKey::LIMIT_SAMPLES , Glib::Variant<uint64_t>::create(1));
hwDev->config_set(sigrok::ConfigKey::SAMPLERATE , Glib::Variant<uint64_t>::create(samplerate));
//::wxMessageBox(Timebase);
// hwDev->config_set(sigrok::ConfigKey::CHANNEL_CONFIG , Glib::Variant<Glib::ustring>::create(MeasChannel));


// hwDev->config_set(sigrok::ConfigKey::TIMEBASE , Glib::Variant<Glib::ustring>::create("100ms"));


auto dfcb = [=](std::shared_ptr<sigrok::Device> device, std::shared_ptr<sigrok::Packet> packet)
{
this->sigrok_datafeed_callback(device, packet);
Expand Down
Binary file modified bin/Debug/LcdTest
Binary file not shown.
Binary file modified bin/Release/LcdTest
Binary file not shown.
Binary file modified obj/Debug/SigrokLcdMain.o
Binary file not shown.
Binary file modified obj/Release/SigrokLcdApp.o
Binary file not shown.
Binary file modified obj/Release/SigrokLcdMain.o
Binary file not shown.

0 comments on commit db809bb

Please sign in to comment.