diff --git a/Examples/ADC/Scope-QT-src/ADC b/Examples/ADC/Scope-QT-src/ADC index bc21bb9..b5bfaae 100755 Binary files a/Examples/ADC/Scope-QT-src/ADC and b/Examples/ADC/Scope-QT-src/ADC differ diff --git a/Examples/ADC/Scope-QT-src/ADC1.pro.user b/Examples/ADC/Scope-QT-src/ADC1.pro.user index 6725c31..aba415f 100644 --- a/Examples/ADC/Scope-QT-src/ADC1.pro.user +++ b/Examples/ADC/Scope-QT-src/ADC1.pro.user @@ -2,204 +2,215 @@ RunConfiguration0-Arguments - + + + + RunConfiguration0-BaseEnvironmentBase + 2 RunConfiguration0-Executable - + /home/juan64bits/Desktop/nn-usb-fpga/Examples/ADC/Scope-QT-src/ADC RunConfiguration0-RunConfiguration.name - Custom Executable + Run /home/juan64bits/Desktop/nn-usb-fpga/Examples/ADC/Scope-QT-src/ADC RunConfiguration0-UseTerminal - false + false RunConfiguration0-UserEnvironmentChanges - + RunConfiguration0-UserName - + RunConfiguration0-UserSetName - false + false RunConfiguration0-WorkingDirectory - $BUILDDIR + $BUILDDIR RunConfiguration0-type - ProjectExplorer.CustomExecutableRunConfiguration + ProjectExplorer.CustomExecutableRunConfiguration activeRunConfiguration - 0 + 0 activebuildconfiguration - Debug + Debug buildConfiguration-Debug - - Debug - 2 - + + Debug + 2 + 0 + + 2 buildconfiguration-Debug-buildstep0 - - Debug - - DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-cTqMrTHqN2,guid=cb05698ea245dbdf49f1995a4bb51c63 - DESKTOP_SESSION=gnome - DESKTOP_STARTUP_ID= - DISPLAY=:0.0 - GDMSESSION=gnome - GDM_KEYBOARD_LAYOUT=es - GDM_LANG=en_US.UTF-8 - GNOME_DESKTOP_SESSION_ID=this-is-deprecated - GNOME_KEYRING_PID=2296 - GNOME_KEYRING_SOCKET=/tmp/keyring-Z9jTYs/socket - GTK_MODULES=canberra-gtk-module - GTK_RC_FILES=/etc/gtk/gtkrc:/home/juan64bits/.gtkrc-1.2-gnome2 - HOME=/home/juan64bits - LANG=en_US.UTF-8 - LANGUAGE= - LD_LIBRARY_PATH=/usr/lib/qtcreator: - LOGNAME=juan64bits - ORBIT_SOCKETDIR=/tmp/orbit-juan64bits - PATH=/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games - PWD=/home/juan64bits - QTDIR=/usr - SESSION_MANAGER=local/Maximus:@/tmp/.ICE-unix/2311,unix/Maximus:/tmp/.ICE-unix/2311 - SHELL=/bin/bash - SHLVL=0 - SPEECHD_PORT=7560 - SSH_AGENT_PID=2357 - SSH_AUTH_SOCK=/tmp/keyring-Z9jTYs/socket.ssh - USER=juan64bits - USERNAME=juan64bits - XAUTHORITY=/var/run/gdm/auth-for-juan64bits-TMPZko/database - XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/ - XDG_SESSION_COOKIE=195688a1fd83f711af67c5214b6a489d-1270160483.283912-172210674 + + Debug + + DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-5HpuZtJngG,guid=d589ba285c2689f6f9124a1b4bdf18d8 + DEFAULTS_PATH=/usr/share/gconf/gnome.default.path + DESKTOP_SESSION=gnome + DISPLAY=:0.0 + GDMSESSION=gnome + GDM_KEYBOARD_LAYOUT=es + GDM_LANG=en_US.utf8 + GNOME_DESKTOP_SESSION_ID=this-is-deprecated + GNOME_KEYRING_CONTROL=/tmp/keyring-rcb57B + GNOME_KEYRING_PID=1475 + GTK_MODULES=canberra-gtk-module + HOME=/home/juan64bits + LANG=en_US.utf8 + LANGUAGE= + LD_LIBRARY_PATH=/usr/lib/qtcreator: + LOGNAME=juan64bits + MANDATORY_PATH=/usr/share/gconf/gnome.mandatory.path + ORBIT_SOCKETDIR=/tmp/orbit-juan64bits + PATH=/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games + PWD=/home/juan64bits + QTDIR=/usr/share/qt4 + SESSION_MANAGER=local/Maximus:@/tmp/.ICE-unix/1493,unix/Maximus:/tmp/.ICE-unix/1493 + SHELL=/bin/bash + SPEECHD_PORT=7560 + SSH_AGENT_PID=1527 + SSH_AUTH_SOCK=/tmp/keyring-rcb57B/ssh + USER=juan64bits + USERNAME=juan64bits + XAUTHORITY=/var/run/gdm/auth-for-juan64bits-ObiAwz/database + XDG_CONFIG_DIRS=/etc/xdg/xdg-gnome:/etc/xdg + XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/ + XDG_SESSION_COOKIE=b9a7fbc4d869fc15bd6cdd474bcc9a28-1272912088.411459-1064788126 - - /home/juan64bits/QT/ADC1/ADC1.pro - -spec - /usr/share/qt4/mkspecs/linux-g++ - -r - CONFIG+=debug + + /home/juan64bits/Desktop/nn-usb-fpga/Examples/ADC/Scope-QT-src/ADC1.pro + -spec + linux-g++ + -r + CONFIG+=debug - /usr/bin/qmake-qt4 - false - /home/juan64bits/QT/ADC1 - 2 + /usr/bin/qmake-qt4 + false + /home/juan64bits/Desktop/nn-usb-fpga/Examples/ADC/Scope-QT-src + buildconfiguration-Debug-buildstep1 - - Debug - - DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-cTqMrTHqN2,guid=cb05698ea245dbdf49f1995a4bb51c63 - DESKTOP_SESSION=gnome - DESKTOP_STARTUP_ID= - DISPLAY=:0.0 - GDMSESSION=gnome - GDM_KEYBOARD_LAYOUT=es - GDM_LANG=en_US.UTF-8 - GNOME_DESKTOP_SESSION_ID=this-is-deprecated - GNOME_KEYRING_PID=2296 - GNOME_KEYRING_SOCKET=/tmp/keyring-Z9jTYs/socket - GTK_MODULES=canberra-gtk-module - GTK_RC_FILES=/etc/gtk/gtkrc:/home/juan64bits/.gtkrc-1.2-gnome2 - HOME=/home/juan64bits - LANG=en_US.UTF-8 - LANGUAGE= - LD_LIBRARY_PATH=/usr/lib/qtcreator: - LOGNAME=juan64bits - ORBIT_SOCKETDIR=/tmp/orbit-juan64bits - PATH=/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games - PWD=/home/juan64bits - QTDIR=/usr - SESSION_MANAGER=local/Maximus:@/tmp/.ICE-unix/2311,unix/Maximus:/tmp/.ICE-unix/2311 - SHELL=/bin/bash - SHLVL=0 - SPEECHD_PORT=7560 - SSH_AGENT_PID=2357 - SSH_AUTH_SOCK=/tmp/keyring-Z9jTYs/socket.ssh - USER=juan64bits - USERNAME=juan64bits - XAUTHORITY=/var/run/gdm/auth-for-juan64bits-TMPZko/database - XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/ - XDG_SESSION_COOKIE=195688a1fd83f711af67c5214b6a489d-1270160483.283912-172210674 + + Debug + + DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-5HpuZtJngG,guid=d589ba285c2689f6f9124a1b4bdf18d8 + DEFAULTS_PATH=/usr/share/gconf/gnome.default.path + DESKTOP_SESSION=gnome + DISPLAY=:0.0 + GDMSESSION=gnome + GDM_KEYBOARD_LAYOUT=es + GDM_LANG=en_US.utf8 + GNOME_DESKTOP_SESSION_ID=this-is-deprecated + GNOME_KEYRING_CONTROL=/tmp/keyring-rcb57B + GNOME_KEYRING_PID=1475 + GTK_MODULES=canberra-gtk-module + HOME=/home/juan64bits + LANG=en_US.utf8 + LANGUAGE= + LD_LIBRARY_PATH=/usr/lib/qtcreator: + LOGNAME=juan64bits + MANDATORY_PATH=/usr/share/gconf/gnome.mandatory.path + ORBIT_SOCKETDIR=/tmp/orbit-juan64bits + PATH=/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games + PWD=/home/juan64bits + QTDIR=/usr/share/qt4 + SESSION_MANAGER=local/Maximus:@/tmp/.ICE-unix/1493,unix/Maximus:/tmp/.ICE-unix/1493 + SHELL=/bin/bash + SPEECHD_PORT=7560 + SSH_AGENT_PID=1527 + SSH_AUTH_SOCK=/tmp/keyring-rcb57B/ssh + USER=juan64bits + USERNAME=juan64bits + XAUTHORITY=/var/run/gdm/auth-for-juan64bits-ObiAwz/database + XDG_CONFIG_DIRS=/etc/xdg/xdg-gnome:/etc/xdg + XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/ + XDG_SESSION_COOKIE=b9a7fbc4d869fc15bd6cdd474bcc9a28-1272912088.411459-1064788126 - - -w + false + + -w - /usr/bin/make - true - /home/juan64bits/QT/ADC1 + /usr/bin/make + true + /home/juan64bits/Desktop/nn-usb-fpga/Examples/ADC/Scope-QT-src buildconfiguration-Debug-cleanstep0 - - Debug + + Debug + true + + clean + buildconfigurations - - Debug + + Debug buildstep0 - - - + + + buildstep1 - - + + buildsteps - - trolltech.qt4projectmanager.qmake - trolltech.qt4projectmanager.make + + trolltech.qt4projectmanager.qmake + trolltech.qt4projectmanager.make cleanstep0 - - - true + + + true cleansteps - - trolltech.qt4projectmanager.make + + trolltech.qt4projectmanager.make defaultFileEncoding - System + System project - + diff --git a/Examples/ADC/Scope-QT-src/ADCw.o b/Examples/ADC/Scope-QT-src/ADCw.o new file mode 100644 index 0000000..965b3a2 Binary files /dev/null and b/Examples/ADC/Scope-QT-src/ADCw.o differ diff --git a/Examples/ADC/Scope-QT-src/Makefile b/Examples/ADC/Scope-QT-src/Makefile index 8018da9..7294088 100644 --- a/Examples/ADC/Scope-QT-src/Makefile +++ b/Examples/ADC/Scope-QT-src/Makefile @@ -1,9 +1,9 @@ ############################################################################# # Makefile for building: ADC -# Generated by qmake (2.01a) (Qt 4.6.2) on: Wed Apr 14 21:04:10 2010 +# Generated by qmake (2.01a) (Qt 4.6.2) on: Mon May 3 17:58:03 2010 # Project: ADC1.pro # Template: app -# Command: /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/bin/qmake -spec ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/qws/linux-openwrt-g++ -unix -o Makefile ADC1.pro +# Command: /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/bin/qmake -spec /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/qws/linux-openwrt-g++ -unix -o Makefile ADC1.pro ############################################################################# ####### Compiler, tools and options @@ -13,7 +13,7 @@ CXX = mipsel-openwrt-linux-uclibc-g++ DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED CFLAGS = -Os -pipe -mips32 -mtune=mips32 -funit-at-a-time -fhonour-copts -msoft-float -I/home/juan64bits/ebd/ECB/openwrt-xburst/staging_dir/target-mipsel_uClibc-0.9.30.1/usr/include/freetype2 -I/home/juan64bits/ebd/ECB/openwrt-xburst/staging_dir/target-mipsel_uClibc-0.9.30.1/usr/include -I/home/juan64bits/ebd/ECB/openwrt-xburst/staging_dir/target-mipsel_uClibc-0.9.30.1/include -I/home/juan64bits/ebd/ECB/openwrt-xburst/staging_dir/toolchain-mipsel_gcc-4.3.3+cs_uClibc-0.9.30.1/usr/include -I/home/juan64bits/ebd/ECB/openwrt-xburst/staging_dir/toolchain-mipsel_gcc-4.3.3+cs_uClibc-0.9.30.1/include -O2 -Wall -W -D_REENTRANT $(DEFINES) CXXFLAGS = -Os -pipe -mips32 -mtune=mips32 -funit-at-a-time -fhonour-copts -msoft-float -I/home/juan64bits/ebd/ECB/openwrt-xburst/staging_dir/target-mipsel_uClibc-0.9.30.1/usr/include/freetype2 -I/home/juan64bits/ebd/ECB/openwrt-xburst/staging_dir/target-mipsel_uClibc-0.9.30.1/usr/include -I/home/juan64bits/ebd/ECB/openwrt-xburst/staging_dir/target-mipsel_uClibc-0.9.30.1/include -I/home/juan64bits/ebd/ECB/openwrt-xburst/staging_dir/toolchain-mipsel_gcc-4.3.3+cs_uClibc-0.9.30.1/usr/include -I/home/juan64bits/ebd/ECB/openwrt-xburst/staging_dir/toolchain-mipsel_gcc-4.3.3+cs_uClibc-0.9.30.1/include -O2 -Wall -W -D_REENTRANT $(DEFINES) -INCPATH = -I../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/qws/linux-openwrt-g++ -I. -I../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/include/QtCore -I../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/include/QtNetwork -I../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/include/QtGui -I../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/include -I. -I. -I. +INCPATH = -I/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/qws/linux-openwrt-g++ -I. -I/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/include/QtCore -I/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/include/QtNetwork -I/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/include/QtGui -I/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/include -I. -I. -I. LINK = mipsel-openwrt-linux-uclibc-g++ LFLAGS = -L/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/lib -L/home/juan64bits/ebd/ECB/openwrt-xburst/staging_dir/target-mipsel_uClibc-0.9.30.1/usr/lib -L/home/juan64bits/ebd/ECB/openwrt-xburst/staging_dir/target-mipsel_uClibc-0.9.30.1/lib -L/home/juan64bits/ebd/ECB/openwrt-xburst/staging_dir/toolchain-mipsel_gcc-4.3.3+cs_uClibc-0.9.30.1/usr/lib -L/home/juan64bits/ebd/ECB/openwrt-xburst/staging_dir/toolchain-mipsel_gcc-4.3.3+cs_uClibc-0.9.30.1/lib -Wl,-rpath-link=/home/juan64bits/ebd/ECB/openwrt-xburst/staging_dir/target-mipsel_uClibc-0.9.30.1/usr/lib -Wl,-O1 LIBS = $(SUBLIBS) -L/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/lib -lQtGui -L/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/lib -L/home/juan64bits/ebd/ECB/openwrt-xburst/staging_dir/target-mipsel_uClibc-0.9.30.1/usr//lib -ldirectfb -lfusion -ldirect -lQtNetwork -lQtCore -lpthread @@ -58,25 +58,25 @@ OBJECTS = main.o \ jz47xx_gpio.o \ jz47xx_mmap.o \ moc_mainwindow.o -DIST = ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/common/g++.conf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/common/unix.conf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/common/linux.conf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/common/qws.conf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/qt_functions.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/qt_config.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/exclusive_builds.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/default_pre.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/release.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/default_post.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/warn_on.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/qt.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/unix/thread.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/moc.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/resources.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/uic.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/yacc.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/lex.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/include_source_dir.prf \ +DIST = /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/common/g++.conf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/common/unix.conf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/common/linux.conf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/common/qws.conf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/qt_functions.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/qt_config.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/exclusive_builds.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/default_pre.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/release.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/default_post.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/warn_on.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/qt.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/unix/thread.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/moc.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/resources.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/uic.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/yacc.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/lex.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/include_source_dir.prf \ ADC1.pro QMAKE_TARGET = ADC DESTDIR = @@ -109,53 +109,53 @@ all: Makefile $(TARGET) $(TARGET): ui_mainwindow.h $(OBJECTS) $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) -Makefile: ADC1.pro ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/qws/linux-openwrt-g++/qmake.conf ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/common/g++.conf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/common/unix.conf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/common/linux.conf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/common/qws.conf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/qt_functions.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/qt_config.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/exclusive_builds.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/default_pre.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/release.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/default_post.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/warn_on.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/qt.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/unix/thread.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/moc.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/resources.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/uic.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/yacc.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/lex.prf \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/include_source_dir.prf \ +Makefile: ADC1.pro /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/qws/linux-openwrt-g++/qmake.conf /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/common/g++.conf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/common/unix.conf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/common/linux.conf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/common/qws.conf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/qt_functions.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/qt_config.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/exclusive_builds.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/default_pre.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/release.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/default_post.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/warn_on.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/qt.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/unix/thread.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/moc.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/resources.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/uic.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/yacc.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/lex.prf \ + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/include_source_dir.prf \ /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/lib/libQtGui.prl \ /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/lib/libQtNetwork.prl \ /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/lib/libQtCore.prl - $(QMAKE) -spec ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/qws/linux-openwrt-g++ -unix -o Makefile ADC1.pro -../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/common/g++.conf: -../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/common/unix.conf: -../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/common/linux.conf: -../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/common/qws.conf: -../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/qt_functions.prf: -../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/qt_config.prf: -../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/exclusive_builds.prf: -../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/default_pre.prf: -../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/release.prf: -../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/default_post.prf: -../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/warn_on.prf: -../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/qt.prf: -../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/unix/thread.prf: -../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/moc.prf: -../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/resources.prf: -../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/uic.prf: -../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/yacc.prf: -../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/lex.prf: -../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/include_source_dir.prf: + $(QMAKE) -spec /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/qws/linux-openwrt-g++ -unix -o Makefile ADC1.pro +/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/common/g++.conf: +/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/common/unix.conf: +/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/common/linux.conf: +/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/common/qws.conf: +/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/qt_functions.prf: +/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/qt_config.prf: +/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/exclusive_builds.prf: +/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/default_pre.prf: +/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/release.prf: +/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/default_post.prf: +/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/warn_on.prf: +/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/qt.prf: +/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/unix/thread.prf: +/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/moc.prf: +/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/resources.prf: +/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/uic.prf: +/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/yacc.prf: +/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/lex.prf: +/home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/features/include_source_dir.prf: /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/lib/libQtGui.prl: /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/lib/libQtNetwork.prl: /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/lib/libQtCore.prl: qmake: FORCE - @$(QMAKE) -spec ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/qws/linux-openwrt-g++ -unix -o Makefile ADC1.pro + @$(QMAKE) -spec /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/mkspecs/qws/linux-openwrt-g++ -unix -o Makefile ADC1.pro dist: @$(CHK_DIR_EXISTS) .tmp/ADC1.0.0 || $(MKDIR) .tmp/ADC1.0.0 @@ -189,7 +189,7 @@ moc_mainwindow.cpp: ADCw.h \ jz47xx_mmap.h \ jz47xx_gpio.h \ mainwindow.h \ - ../../../../openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/bin/moc + /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/bin/moc /home/juan64bits/ebd/ECB/openwrt-xburst/build_dir/target-mipsel_uClibc-0.9.30.1/qt-everywhere-opensource-src-4.6.2/bin/moc $(DEFINES) $(INCPATH) mainwindow.h -o moc_mainwindow.cpp compiler_rcc_make_all: diff --git a/Examples/ADC/Scope-QT-src/jz47xx_gpio.o b/Examples/ADC/Scope-QT-src/jz47xx_gpio.o new file mode 100644 index 0000000..d798588 Binary files /dev/null and b/Examples/ADC/Scope-QT-src/jz47xx_gpio.o differ diff --git a/Examples/ADC/Scope-QT-src/jz47xx_mmap.o b/Examples/ADC/Scope-QT-src/jz47xx_mmap.o new file mode 100644 index 0000000..ff59845 Binary files /dev/null and b/Examples/ADC/Scope-QT-src/jz47xx_mmap.o differ diff --git a/Examples/ADC/Scope-QT-src/jz_adc_peripheral.h b/Examples/ADC/Scope-QT-src/jz_adc_peripheral.h index e672bd1..a60d143 100644 --- a/Examples/ADC/Scope-QT-src/jz_adc_peripheral.h +++ b/Examples/ADC/Scope-QT-src/jz_adc_peripheral.h @@ -1,7 +1,7 @@ /* ADC Peripheral.h Copyright (C) 2010 Carlos Camargo cicamargoba@unal.edu.co - Andres Calderon andres.calderon@emqbit.com + Andres Calderon andres.calderon@emqbit.com This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -71,8 +71,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #define ADC_MAX_BUFFER 0x3FE/* 1022 reads/commands */ -#define CS2_PORT JZ_GPIO_PORT_B -#define CS2_PIN 26 +#define CS2_PORT JZ_GPIO_PORT_B +#define CS2_PIN 26 typedef unsigned char uchar; diff --git a/Examples/ADC/Scope-QT-src/jz_adc_peripheral.o b/Examples/ADC/Scope-QT-src/jz_adc_peripheral.o new file mode 100644 index 0000000..108b3f9 Binary files /dev/null and b/Examples/ADC/Scope-QT-src/jz_adc_peripheral.o differ diff --git a/Examples/ADC/Scope-QT-src/main.o b/Examples/ADC/Scope-QT-src/main.o new file mode 100644 index 0000000..11bad15 Binary files /dev/null and b/Examples/ADC/Scope-QT-src/main.o differ diff --git a/Examples/ADC/Scope-QT-src/mainwindow.cpp b/Examples/ADC/Scope-QT-src/mainwindow.cpp index f6fbbe2..6a922b6 100755 --- a/Examples/ADC/Scope-QT-src/mainwindow.cpp +++ b/Examples/ADC/Scope-QT-src/mainwindow.cpp @@ -9,20 +9,20 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { ui->setupUi(this); - connect(this,SIGNAL(refresh()),ui->Graph, SLOT(repaint())); - ui->Graph->setPointsPerPlot(120); - ui->Graph->setVoltsPerDiv(205); + connect(this,SIGNAL(refresh()),ui->Graph, SLOT(repaint())); + ui->Graph->setPointsPerPlot(120); + ui->Graph->setVoltsPerDiv(205); - timer1 = new QTimer(this); - timer1->start(50); - connect(timer1, SIGNAL(timeout()), this, SLOT(updateGraph())); + timer1 = new QTimer(this); + timer1->start(50); + connect(timer1, SIGNAL(timeout()), this, SLOT(updateGraph())); - ADC1 = new ADCw; - ADC1->testADC(); - ADC1->setBufferLen(240); - ADC1->setClockDiv(ADC_SPI_CLKDIV_MIN); //Max. speed - ADC1->setMuxChannels(1); - printf("\nTaking 120 samples by channel at Fs=99KHz (trigger=50ms)\n"); + ADC1 = new ADCw; + ADC1->testADC(); + ADC1->setBufferLen(240); + ADC1->setClockDiv(ADC_SPI_CLKDIV_MIN); //Max. speed + ADC1->setMuxChannels(1); + printf("\nTaking 120 samples by channel at Fs=99KHz (trigger=50ms)\n"); } MainWindow::~MainWindow() @@ -32,18 +32,83 @@ MainWindow::~MainWindow() void MainWindow::updateGraph() { - JZ_REG * dataADC; + JZ_REG * dataADC; - int tempD; + int tempD; + deltaCountCH1=0; deltaCountCH2=0; + idxCH1=0; idxCH2=0; - dataADC=ADC1->takeSamplesADC(0); - for(int i=0; i< 240/2; i++) - { - tempD = dataADC[i]&0x0FFF; - ui->Graph->addPoint1(tempD+0x3ff); - tempD = (dataADC[i]>>16)&0x0FFF; - ui->Graph->addPoint2(tempD); - } + dataADC=ADC1->takeSamplesADC(0); + for(int i=0; i< 240/2; i++) + { + tempD = dataADC[i]&0x0FFF; + //tempD = cos(2.6*PI*i/200)*0x200+0x200; + ui->Graph->addPoint1(tempD+0x3ff); - emit refresh(); + sign2_CH1 = getSign(tempD-0x200); + if((sign1_CH1!=sign2_CH1) & (i>1)) + deltaCountCH1++; + + if((deltaCountCH1>0) & (deltaCountCH1<3)) + { + valCH1[idxCH1]= tempD-0x200; + idxCH1 ++; + } + + sign1_CH1=sign2_CH1; + + tempD = (dataADC[i]>>16)&0x0FFF; + //tempD = cos(5*PI*i/200)*0x200+0x200; + ui->Graph->addPoint2(tempD); + + sign2_CH2 = getSign(tempD-0x200); + if((sign1_CH2!=sign2_CH2) & (i>1)) + deltaCountCH2++; + + if((deltaCountCH2>0) & (deltaCountCH2<3)) + { + valCH2[idxCH2]= tempD-0x200; + idxCH2 ++; + } + + sign1_CH2=sign2_CH2; + } + + double Vrms=0, Vm=0; + for(int i=0; i2) + { + ui->txtVrmsCH1->setText(QString::number(sqrt(Vrms))); + ui->txtVmCH1->setText(QString::number(Vm)); + } + else + { + ui->txtVrmsCH1->setText("???"); + ui->txtVmCH1->setText("???"); + } + + Vrms=0; Vm=0; + for(int i=0; i2) + { + ui->txtVrmsCH2->setText(QString::number(sqrt(Vrms))); + ui->txtVmCH2->setText(QString::number(Vm)); + } + else + { + ui->txtVrmsCH2->setText("???"); + ui->txtVmCH2->setText("???"); + } + + emit refresh(); } diff --git a/Examples/ADC/Scope-QT-src/mainwindow.h b/Examples/ADC/Scope-QT-src/mainwindow.h index f06f4ba..fbc1eac 100755 --- a/Examples/ADC/Scope-QT-src/mainwindow.h +++ b/Examples/ADC/Scope-QT-src/mainwindow.h @@ -4,6 +4,8 @@ #include #include "ADCw.h" +#define PI 3.14159265 + namespace Ui { class MainWindow; @@ -17,6 +19,8 @@ public: MainWindow(QWidget *parent = 0); ~MainWindow(); + bool getSign(int val){if(val<0) return 0; else return 1;} + public slots: void updateGraph(); @@ -28,6 +32,12 @@ private: QTimer *timer1; ADCw *ADC1; bool CHANNEL; + + bool sign1_CH1, sign2_CH1; ; + bool sign1_CH2, sign2_CH2; + int deltaCountCH1, deltaCountCH2; + int idxCH1, idxCH2; + double valCH1[200], valCH2[200]; }; #endif // MAINWINDOW_H diff --git a/Examples/ADC/Scope-QT-src/mainwindow.o b/Examples/ADC/Scope-QT-src/mainwindow.o new file mode 100644 index 0000000..e952cdd Binary files /dev/null and b/Examples/ADC/Scope-QT-src/mainwindow.o differ diff --git a/Examples/ADC/Scope-QT-src/mainwindow.ui b/Examples/ADC/Scope-QT-src/mainwindow.ui index 8a9e77e..1302269 100755 --- a/Examples/ADC/Scope-QT-src/mainwindow.ui +++ b/Examples/ADC/Scope-QT-src/mainwindow.ui @@ -14,18 +14,186 @@ ADC Test - - - - - - 100 - 20 - - - - - + + + + 0 + 0 + 240 + 240 + + + + + 100 + 20 + + + + + + + 240 + 120 + 81 + 46 + + + + + 0 + + + QLayout::SetDefaultConstraint + + + + + Vm CH2 + + + Qt::AlignCenter + + + + + + + ##.## + + + Qt::AlignCenter + + + true + + + + + + + + + 240 + 60 + 81 + 46 + + + + + 0 + + + QLayout::SetDefaultConstraint + + + + + Vrms CH1 + + + Qt::AlignCenter + + + + + + + ##.## + + + Qt::AlignCenter + + + true + + + + + + + + + 240 + 180 + 81 + 46 + + + + + 0 + + + QLayout::SetDefaultConstraint + + + + + Vrms CH2 + + + Qt::AlignCenter + + + + + + + ##.## + + + Qt::AlignCenter + + + true + + + + + + + + + 240 + 10 + 81 + 41 + + + + + 0 + + + QLayout::SetDefaultConstraint + + + + + Vm CH1 + + + Qt::AlignCenter + + + + + + + ##.## + + + Qt::AlignCenter + + + true + + + + + diff --git a/Examples/ADC/Scope-QT-src/moc_mainwindow.cpp b/Examples/ADC/Scope-QT-src/moc_mainwindow.cpp new file mode 100644 index 0000000..5ed08e8 --- /dev/null +++ b/Examples/ADC/Scope-QT-src/moc_mainwindow.cpp @@ -0,0 +1,89 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'mainwindow.h' +** +** Created: Mon May 3 17:58:08 2010 +** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "mainwindow.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'mainwindow.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 62 +#error "This file was generated using the moc from 4.6.2. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_MainWindow[] = { + + // content: + 4, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 1, // signalCount + + // signals: signature, parameters, type, tag, flags + 12, 11, 11, 11, 0x05, + + // slots: signature, parameters, type, tag, flags + 22, 11, 11, 11, 0x0a, + + 0 // eod +}; + +static const char qt_meta_stringdata_MainWindow[] = { + "MainWindow\0\0refresh()\0updateGraph()\0" +}; + +const QMetaObject MainWindow::staticMetaObject = { + { &QMainWindow::staticMetaObject, qt_meta_stringdata_MainWindow, + qt_meta_data_MainWindow, 0 } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &MainWindow::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *MainWindow::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *MainWindow::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_MainWindow)) + return static_cast(const_cast< MainWindow*>(this)); + return QMainWindow::qt_metacast(_clname); +} + +int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QMainWindow::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + switch (_id) { + case 0: refresh(); break; + case 1: updateGraph(); break; + default: ; + } + _id -= 2; + } + return _id; +} + +// SIGNAL 0 +void MainWindow::refresh() +{ + QMetaObject::activate(this, &staticMetaObject, 0, 0); +} +QT_END_MOC_NAMESPACE diff --git a/Examples/ADC/Scope-QT-src/moc_mainwindow.o b/Examples/ADC/Scope-QT-src/moc_mainwindow.o new file mode 100644 index 0000000..187eb10 Binary files /dev/null and b/Examples/ADC/Scope-QT-src/moc_mainwindow.o differ diff --git a/Examples/ADC/Scope-QT-src/signaldisplay.o b/Examples/ADC/Scope-QT-src/signaldisplay.o new file mode 100644 index 0000000..f43d5fa Binary files /dev/null and b/Examples/ADC/Scope-QT-src/signaldisplay.o differ diff --git a/Examples/ADC/Scope-QT-src/ui_mainwindow.h b/Examples/ADC/Scope-QT-src/ui_mainwindow.h new file mode 100644 index 0000000..c47b03f --- /dev/null +++ b/Examples/ADC/Scope-QT-src/ui_mainwindow.h @@ -0,0 +1,192 @@ +/******************************************************************************** +** Form generated from reading UI file 'mainwindow.ui' +** +** Created: Mon May 3 17:58:03 2010 +** by: Qt User Interface Compiler version 4.6.2 +** +** WARNING! All changes made in this file will be lost when recompiling UI file! +********************************************************************************/ + +#ifndef UI_MAINWINDOW_H +#define UI_MAINWINDOW_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +QT_BEGIN_NAMESPACE + +class Ui_MainWindow +{ +public: + QAction *action_Salir; + QAction *actionA_cerca_de; + QAction *actionAcerca_de_QT; + QAction *actionAcerca_de_Qt; + QWidget *centralWidget; + SignalDisplay *Graph; + QWidget *layoutWidget; + QVBoxLayout *verticalLayout_2; + QLabel *lblVmCH2; + QLineEdit *txtVmCH2; + QWidget *layoutWidget_2; + QVBoxLayout *verticalLayout_3; + QLabel *lblVrmsCH1; + QLineEdit *txtVrmsCH1; + QWidget *layoutWidget_3; + QVBoxLayout *verticalLayout_4; + QLabel *lblVrmsCH2; + QLineEdit *txtVrmsCH2; + QWidget *widget; + QVBoxLayout *verticalLayout; + QLabel *lblVmCH1; + QLineEdit *txtVmCH1; + + void setupUi(QMainWindow *MainWindow) + { + if (MainWindow->objectName().isEmpty()) + MainWindow->setObjectName(QString::fromUtf8("MainWindow")); + MainWindow->resize(320, 240); + action_Salir = new QAction(MainWindow); + action_Salir->setObjectName(QString::fromUtf8("action_Salir")); + actionA_cerca_de = new QAction(MainWindow); + actionA_cerca_de->setObjectName(QString::fromUtf8("actionA_cerca_de")); + actionAcerca_de_QT = new QAction(MainWindow); + actionAcerca_de_QT->setObjectName(QString::fromUtf8("actionAcerca_de_QT")); + actionAcerca_de_Qt = new QAction(MainWindow); + actionAcerca_de_Qt->setObjectName(QString::fromUtf8("actionAcerca_de_Qt")); + centralWidget = new QWidget(MainWindow); + centralWidget->setObjectName(QString::fromUtf8("centralWidget")); + Graph = new SignalDisplay(centralWidget); + Graph->setObjectName(QString::fromUtf8("Graph")); + Graph->setGeometry(QRect(0, 0, 240, 240)); + Graph->setMinimumSize(QSize(100, 20)); + layoutWidget = new QWidget(centralWidget); + layoutWidget->setObjectName(QString::fromUtf8("layoutWidget")); + layoutWidget->setGeometry(QRect(240, 120, 81, 46)); + verticalLayout_2 = new QVBoxLayout(layoutWidget); + verticalLayout_2->setSpacing(0); + verticalLayout_2->setContentsMargins(11, 11, 11, 11); + verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2")); + verticalLayout_2->setSizeConstraint(QLayout::SetDefaultConstraint); + verticalLayout_2->setContentsMargins(0, 0, 0, 0); + lblVmCH2 = new QLabel(layoutWidget); + lblVmCH2->setObjectName(QString::fromUtf8("lblVmCH2")); + lblVmCH2->setAlignment(Qt::AlignCenter); + + verticalLayout_2->addWidget(lblVmCH2); + + txtVmCH2 = new QLineEdit(layoutWidget); + txtVmCH2->setObjectName(QString::fromUtf8("txtVmCH2")); + txtVmCH2->setAlignment(Qt::AlignCenter); + txtVmCH2->setReadOnly(true); + + verticalLayout_2->addWidget(txtVmCH2); + + layoutWidget_2 = new QWidget(centralWidget); + layoutWidget_2->setObjectName(QString::fromUtf8("layoutWidget_2")); + layoutWidget_2->setGeometry(QRect(240, 60, 81, 46)); + verticalLayout_3 = new QVBoxLayout(layoutWidget_2); + verticalLayout_3->setSpacing(0); + verticalLayout_3->setContentsMargins(11, 11, 11, 11); + verticalLayout_3->setObjectName(QString::fromUtf8("verticalLayout_3")); + verticalLayout_3->setSizeConstraint(QLayout::SetDefaultConstraint); + verticalLayout_3->setContentsMargins(0, 0, 0, 0); + lblVrmsCH1 = new QLabel(layoutWidget_2); + lblVrmsCH1->setObjectName(QString::fromUtf8("lblVrmsCH1")); + lblVrmsCH1->setAlignment(Qt::AlignCenter); + + verticalLayout_3->addWidget(lblVrmsCH1); + + txtVrmsCH1 = new QLineEdit(layoutWidget_2); + txtVrmsCH1->setObjectName(QString::fromUtf8("txtVrmsCH1")); + txtVrmsCH1->setAlignment(Qt::AlignCenter); + txtVrmsCH1->setReadOnly(true); + + verticalLayout_3->addWidget(txtVrmsCH1); + + layoutWidget_3 = new QWidget(centralWidget); + layoutWidget_3->setObjectName(QString::fromUtf8("layoutWidget_3")); + layoutWidget_3->setGeometry(QRect(240, 180, 81, 46)); + verticalLayout_4 = new QVBoxLayout(layoutWidget_3); + verticalLayout_4->setSpacing(0); + verticalLayout_4->setContentsMargins(11, 11, 11, 11); + verticalLayout_4->setObjectName(QString::fromUtf8("verticalLayout_4")); + verticalLayout_4->setSizeConstraint(QLayout::SetDefaultConstraint); + verticalLayout_4->setContentsMargins(0, 0, 0, 0); + lblVrmsCH2 = new QLabel(layoutWidget_3); + lblVrmsCH2->setObjectName(QString::fromUtf8("lblVrmsCH2")); + lblVrmsCH2->setAlignment(Qt::AlignCenter); + + verticalLayout_4->addWidget(lblVrmsCH2); + + txtVrmsCH2 = new QLineEdit(layoutWidget_3); + txtVrmsCH2->setObjectName(QString::fromUtf8("txtVrmsCH2")); + txtVrmsCH2->setAlignment(Qt::AlignCenter); + txtVrmsCH2->setReadOnly(true); + + verticalLayout_4->addWidget(txtVrmsCH2); + + widget = new QWidget(centralWidget); + widget->setObjectName(QString::fromUtf8("widget")); + widget->setGeometry(QRect(240, 10, 81, 41)); + verticalLayout = new QVBoxLayout(widget); + verticalLayout->setSpacing(0); + verticalLayout->setContentsMargins(11, 11, 11, 11); + verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); + verticalLayout->setSizeConstraint(QLayout::SetDefaultConstraint); + verticalLayout->setContentsMargins(0, 0, 0, 0); + lblVmCH1 = new QLabel(widget); + lblVmCH1->setObjectName(QString::fromUtf8("lblVmCH1")); + lblVmCH1->setAlignment(Qt::AlignCenter); + + verticalLayout->addWidget(lblVmCH1); + + txtVmCH1 = new QLineEdit(widget); + txtVmCH1->setObjectName(QString::fromUtf8("txtVmCH1")); + txtVmCH1->setAlignment(Qt::AlignCenter); + txtVmCH1->setReadOnly(true); + + verticalLayout->addWidget(txtVmCH1); + + MainWindow->setCentralWidget(centralWidget); + + retranslateUi(MainWindow); + + QMetaObject::connectSlotsByName(MainWindow); + } // setupUi + + void retranslateUi(QMainWindow *MainWindow) + { + MainWindow->setWindowTitle(QApplication::translate("MainWindow", "ADC Test", 0, QApplication::UnicodeUTF8)); + action_Salir->setText(QApplication::translate("MainWindow", "&Salir", 0, QApplication::UnicodeUTF8)); + actionA_cerca_de->setText(QApplication::translate("MainWindow", "A&cerca de...", 0, QApplication::UnicodeUTF8)); + actionAcerca_de_QT->setText(QApplication::translate("MainWindow", "Acerca de &QT", 0, QApplication::UnicodeUTF8)); + actionAcerca_de_Qt->setText(QApplication::translate("MainWindow", "Acerca de &Qt...", 0, QApplication::UnicodeUTF8)); + lblVmCH2->setText(QApplication::translate("MainWindow", "Vm CH2", 0, QApplication::UnicodeUTF8)); + txtVmCH2->setText(QApplication::translate("MainWindow", "##.##", 0, QApplication::UnicodeUTF8)); + lblVrmsCH1->setText(QApplication::translate("MainWindow", "Vrms CH1", 0, QApplication::UnicodeUTF8)); + txtVrmsCH1->setText(QApplication::translate("MainWindow", "##.##", 0, QApplication::UnicodeUTF8)); + lblVrmsCH2->setText(QApplication::translate("MainWindow", "Vrms CH2", 0, QApplication::UnicodeUTF8)); + txtVrmsCH2->setText(QApplication::translate("MainWindow", "##.##", 0, QApplication::UnicodeUTF8)); + lblVmCH1->setText(QApplication::translate("MainWindow", "Vm CH1", 0, QApplication::UnicodeUTF8)); + txtVmCH1->setText(QApplication::translate("MainWindow", "##.##", 0, QApplication::UnicodeUTF8)); + } // retranslateUi + +}; + +namespace Ui { + class MainWindow: public Ui_MainWindow {}; +} // namespace Ui + +QT_END_NAMESPACE + +#endif // UI_MAINWINDOW_H