diff --git a/.cproject b/.cproject
index 94fcb31..0d6f803 100644
--- a/.cproject
+++ b/.cproject
@@ -1,164 +1,112 @@
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
-
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/.project b/.project
index 57b07d8..177df2b 100644
--- a/.project
+++ b/.project
@@ -3,6 +3,7 @@
PiScan
+ rtl-sdr
diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
new file mode 100644
index 0000000..ac89595
--- /dev/null
+++ b/.settings/language.settings.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.settings/org.eclipse.cdt.core.prefs b/.settings/org.eclipse.cdt.core.prefs
index 9390c80..03de2fb 100644
--- a/.settings/org.eclipse.cdt.core.prefs
+++ b/.settings/org.eclipse.cdt.core.prefs
@@ -1,4 +1,17 @@
eclipse.preferences.version=1
+environment/project/cdt.managedbuild.config.gnu.cygwin.exe.debug.65650796/PATH/delimiter=;
+environment/project/cdt.managedbuild.config.gnu.cygwin.exe.debug.65650796/PATH/operation=append
+environment/project/cdt.managedbuild.config.gnu.cygwin.exe.debug.65650796/PATH/value=${RPI_HOME}\\bin;C\:/Program Files/Java/jre1.8.0_171/bin/server;C\:/Program Files/Java/jre1.8.0_171/bin;C\:/Program Files/Java/jre1.8.0_171/lib/amd64;C\:\\Program Files (x86)\\Common Files\\Oracle\\Java\\javapath;C\:\\ProgramData\\Oracle\\Java\\javapath;C\:\\Program Files (x86)\\Intel\\iCLS Client\\;C\:\\Program Files\\Intel\\iCLS Client\\;C\:\\Windows\\system32;C\:\\Windows;C\:\\Windows\\System32\\Wbem;C\:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C\:\\Program Files (x86)\\Intel\\Intel(R) Management Engine Components\\DAL;C\:\\Program Files\\Intel\\Intel(R) Management Engine Components\\DAL;C\:\\Program Files (x86)\\Intel\\Intel(R) Management Engine Components\\IPT;C\:\\Program Files\\Intel\\Intel(R) Management Engine Components\\IPT;C\:\\Program Files (x86)\\NVIDIA Corporation\\PhysX\\Common;C\:\\Program Files (x86)\\QuickTime\\QTSystem\\;C\:\\WINDOWS\\system32;C\:\\WINDOWS;C\:\\WINDOWS\\System32\\Wbem;C\:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\;C\:\\Program Files (x86)\\PharosSystems\\Core;C\:\\WINDOWS\\system32\\config\\systemprofile\\.dnx\\bin;C\:\\Program Files\\Microsoft DNX\\Dnvm\\;C\:\\Program Files (x86)\\Windows Kits\\8.1\\Windows Performance Toolkit\\;C\:\\Program Files\\Microsoft SQL Server\\120\\Tools\\Binn\\;C\:\\Program Files\\Microsoft SQL Server\\130\\Tools\\Binn\\;C\:\\Program Files (x86)\\nodejs\\;C\:\\Program Files\\Git\\cmd;C\:\\Program Files\\MATLAB\\R2017a\\runtime\\win64;C\:\\Program Files\\MATLAB\\R2017a\\bin;C\:\\Program Files\\Intel\\WiFi\\bin\\;C\:\\Program Files\\Common Files\\Intel\\WirelessCommon\\;C\:\\WINDOWS\\System32\\OpenSSH\\;C\:\\SysGCC\\raspberry\\bin;C\:\\Users\\kidsr\\AppData\\Local\\Programs\\Python\\Python36-32\\Scripts\\;C\:\\Users\\kidsr\\AppData\\Local\\Programs\\Python\\Python36-32\\;C\:\\Users\\kidsr\\AppData\\Local\\Microsoft\\WindowsApps;C\:\\Users\\kidsr\\AppData\\Roaming\\npm;C\:\\Program Files\\Java\\jdk1.8.0_144\\bin;C\:\\Program Files\\Intel\\WiFi\\bin\\;C\:\\Program Files\\Common Files\\Intel\\WirelessCommon\\;C\:\\Program Files (x86)\\Independent Binaries;C\:\\Program Files (x86)\\WinSCP;C\:\\Users\\kidsr\\AppData\\Local\\GitHubDesktop\\bin;C\:\\Users\\kidsr\\Desktop
+environment/project/cdt.managedbuild.config.gnu.cygwin.exe.debug.65650796/RPI_HOME/delimiter=;
+environment/project/cdt.managedbuild.config.gnu.cygwin.exe.debug.65650796/RPI_HOME/operation=append
+environment/project/cdt.managedbuild.config.gnu.cygwin.exe.debug.65650796/RPI_HOME/value=C\:\\SysGCC\\raspberry
+environment/project/cdt.managedbuild.config.gnu.cygwin.exe.debug.65650796/append=true
+environment/project/cdt.managedbuild.config.gnu.cygwin.exe.debug.65650796/appendContributed=true
+environment/project/cdt.managedbuild.config.gnu.cygwin.exe.release.1527787607/RPI_HOME/delimiter=;
+environment/project/cdt.managedbuild.config.gnu.cygwin.exe.release.1527787607/RPI_HOME/operation=append
+environment/project/cdt.managedbuild.config.gnu.cygwin.exe.release.1527787607/RPI_HOME/value=C\:\\SysGCC\\raspberry
+environment/project/cdt.managedbuild.config.gnu.cygwin.exe.release.1527787607/append=true
+environment/project/cdt.managedbuild.config.gnu.cygwin.exe.release.1527787607/appendContributed=true
environment/project/org.eclipse.cdt.msvc.exe.debug.1269692248.1652501512/RASPBERRY/delimiter=;
environment/project/org.eclipse.cdt.msvc.exe.debug.1269692248.1652501512/RASPBERRY/operation=append
environment/project/org.eclipse.cdt.msvc.exe.debug.1269692248.1652501512/RASPBERRY/value=C\:\\SysGCC\\raspberry
diff --git a/.settings/org.eclipse.cdt.managedbuilder.core.prefs b/.settings/org.eclipse.cdt.managedbuilder.core.prefs
index c5b8b6f..582fa7b 100644
--- a/.settings/org.eclipse.cdt.managedbuilder.core.prefs
+++ b/.settings/org.eclipse.cdt.managedbuilder.core.prefs
@@ -1,8 +1,4 @@
eclipse.preferences.version=1
-environment/buildEnvironmentInclude/org.eclipse.cdt.msvc.exe.debug.1269692248.1652501512/CPATH/delimiter=;
-environment/buildEnvironmentInclude/org.eclipse.cdt.msvc.exe.debug.1269692248.1652501512/CPATH/operation=remove
-environment/buildEnvironmentInclude/org.eclipse.cdt.msvc.exe.debug.1269692248.1652501512/C_INCLUDE_PATH/delimiter=;
-environment/buildEnvironmentInclude/org.eclipse.cdt.msvc.exe.debug.1269692248.1652501512/C_INCLUDE_PATH/operation=remove
environment/buildEnvironmentInclude/org.eclipse.cdt.msvc.exe.debug.1269692248.1652501512/append=true
environment/buildEnvironmentInclude/org.eclipse.cdt.msvc.exe.debug.1269692248.1652501512/appendContributed=true
environment/buildEnvironmentInclude/org.eclipse.cdt.msvc.exe.debug.1269692248/CPATH/delimiter=;
@@ -11,8 +7,6 @@ environment/buildEnvironmentInclude/org.eclipse.cdt.msvc.exe.debug.1269692248/C_
environment/buildEnvironmentInclude/org.eclipse.cdt.msvc.exe.debug.1269692248/C_INCLUDE_PATH/operation=remove
environment/buildEnvironmentInclude/org.eclipse.cdt.msvc.exe.debug.1269692248/append=true
environment/buildEnvironmentInclude/org.eclipse.cdt.msvc.exe.debug.1269692248/appendContributed=true
-environment/buildEnvironmentLibrary/org.eclipse.cdt.msvc.exe.debug.1269692248.1652501512/LIBRARY_PATH/delimiter=;
-environment/buildEnvironmentLibrary/org.eclipse.cdt.msvc.exe.debug.1269692248.1652501512/LIBRARY_PATH/operation=remove
environment/buildEnvironmentLibrary/org.eclipse.cdt.msvc.exe.debug.1269692248.1652501512/append=true
environment/buildEnvironmentLibrary/org.eclipse.cdt.msvc.exe.debug.1269692248.1652501512/appendContributed=true
environment/buildEnvironmentLibrary/org.eclipse.cdt.msvc.exe.debug.1269692248/LIBRARY_PATH/delimiter=;
diff --git a/PiScan.pro b/PiScan.pro
new file mode 100644
index 0000000..f393ebf
--- /dev/null
+++ b/PiScan.pro
@@ -0,0 +1,61 @@
+# Created by and for Qt Creator This file was created for editing the project sources only.
+# You may attempt to use it for building too, by modifying this file here.
+
+#TARGET = PiScan
+
+HEADERS = \
+ $$PWD/src/interface/display/graphic_lcd/display.h \
+ $$PWD/src/interface/display/graphic_lcd/drv_pipe.h \
+ $$PWD/src/interface/display/graphic_lcd/font.h \
+ $$PWD/src/interface/display/graphic_lcd/font_6x8.h \
+ $$PWD/src/interface/display/graphic_lcd/font_6x8_bold.h \
+ $$PWD/src/interface/display/graphic_lcd/font_lucida16pt.h \
+ $$PWD/src/interface/display/graphic_lcd/font_lucida7pt.h \
+ $$PWD/src/interface/display/graphic_lcd/font_lucida8pt.h \
+ $$PWD/src/interface/display/graphic_lcd.h \
+ $$PWD/src/debug.h \
+ $$PWD/src/event.h \
+ $$PWD/src/gpio.h \
+ $$PWD/src/interface.h \
+ $$PWD/src/scan_tree.h \
+ $$PWD/src/scanner.h \
+ $$PWD/src/tuner.h
+
+SOURCES = \
+ $$PWD/profiles/Test profile 1/Analog system 1/.scn \
+ $$PWD/profiles/Test profile 1/Analog system 1.scn \
+ $$PWD/profiles/Test profile 1.sp \
+ $$PWD/res/sounds/beep.wav \
+ $$PWD/res/sounds/critical_error.wav \
+ $$PWD/res/sounds/error.wav \
+ $$PWD/res/sounds/info_1.wav \
+ $$PWD/res/sounds/info_2.wav \
+ $$PWD/res/sounds/start.wav \
+ $$PWD/res/sounds/stop.wav \
+ $$PWD/src/interface/display/driver/drv_MatrixOrbitalGX.c \
+ $$PWD/src/interface/display/graphic_lcd/drv_pipe.c \
+ $$PWD/src/interface/display/graphic_lcd/font_lucida16pt.c \
+ $$PWD/src/interface/display/graphic_lcd/font_lucida7pt.c \
+ $$PWD/src/interface/display/graphic_lcd/font_lucida8pt.c \
+ $$PWD/src/interface/display/graphic_lcd/graphic_lcd.c \
+ $$PWD/src/interface/int_MatrixOrbitalGX_GPIO.c \
+ $$PWD/src/debug.c \
+ $$PWD/src/event.c \
+ $$PWD/src/interface.c \
+ $$PWD/src/piscan.c \
+ $$PWD/src/rtl_fm.c \
+ $$PWD/src/scan_tree.c \
+ $$PWD/src/scanner.c \
+ $$PWD/src/tuner.c \
+ $$PWD/tests/test_event_service.c \
+ $$PWD/tests/test_graphic_lcd.c \
+ $$PWD/tests/test_scan_tree.c \
+ $$PWD/tests/test_tuner_thread.c
+
+INCLUDEPATH = \
+ $$PWD/src \
+ $$PWD/src/interface/display \
+ $$PWD/src/interface/display/graphic_lcd
+
+#DEFINES =
+
diff --git a/spec.i b/spec.i
new file mode 100644
index 0000000..81ced8a
--- /dev/null
+++ b/spec.i
@@ -0,0 +1 @@
+#line 1 "C:/Users/kidsr/eclipse-workspace/.metadata/.plugins/org.eclipse.cdt.managedbuilder.core/spec.C"
diff --git a/src/event.c b/src/event.c
index 910f856..51763c4 100644
--- a/src/event.c
+++ b/src/event.c
@@ -34,7 +34,7 @@ int push_event(EVENT_ID evid, void *data){
return 0;
}
-void *global_event_listener_thread(void){
+void global_event_listener_thread(void){
info(EVT_HANDLER_TAG, "Starting event handler");
int run = 1;
diff --git a/src/event.h b/src/event.h
index 0baae81..e7592ca 100644
--- a/src/event.h
+++ b/src/event.h
@@ -64,7 +64,7 @@ typedef struct {
}EVENT;
int push_event(EVENT_ID evid, void *data);
-void *global_event_listener_thread(void);
+void global_event_listener_thread(void);
void global_event_handler(EVENT *event);
extern void scanner_event_handler(EVENT *event);
diff --git a/src/interface/display/driver/drv_MatrixOrbitalGX.c b/src/interface/display/driver/drv_MatrixOrbitalGX.c
index f444a70..10501ca 100644
--- a/src/interface/display/driver/drv_MatrixOrbitalGX.c
+++ b/src/interface/display/driver/drv_MatrixOrbitalGX.c
@@ -49,8 +49,8 @@
//#include
//#include
-#include
-#include
+#include
+//#include
/*
#include "debug.h"
#include "cfg.h"
diff --git a/src/rtl_fm.c b/src/rtl_fm.c
index ffb950e..cbb8961 100644
--- a/src/rtl_fm.c
+++ b/src/rtl_fm.c
@@ -71,7 +71,7 @@
#include
#include
-#include
+#include
#include "rtl-sdr.h"
#include "convenience/convenience.h"
diff --git a/tests/test_event_service.c b/tests/test_event_service.c
index ab391f2..4b1f69e 100644
--- a/tests/test_event_service.c
+++ b/tests/test_event_service.c
@@ -24,7 +24,7 @@ int main(void){
push_event(GLOBAL_READY, NULL);
info(TEST_TAG, "Creating thread");
- pthread_create(&event_thread, NULL, global_event_listener_thread, NULL);
+ pthread_create(&event_thread, NULL, &global_event_listener_thread, NULL);
//system("pause");
info(TEST_TAG, "Pushing thread-time events");
diff --git a/tests/test_scan_tree.c b/tests/test_scan_tree.c
index 15b5499..37fc93a 100644
--- a/tests/test_scan_tree.c
+++ b/tests/test_scan_tree.c
@@ -90,11 +90,11 @@ int main(void){
}
fprintf(stdout, "Saving file\n");
- if(scan_profile_save(&generated_profile, test_directory))
+ if(scan_profile_save(&generated_profile))
fprintf(stdout, "Saved successfully\n");
fprintf(stdout, "Loading scan file\n");
- scan_profile_load(&loaded_profile, test_directory);
+ scan_profile_load(&loaded_profile);
system("pause");
return 0;
diff --git a/tests/test_tuner_thread.c b/tests/test_tuner_thread.c
index 9dfb747..86a0ae4 100644
--- a/tests/test_tuner_thread.c
+++ b/tests/test_tuner_thread.c
@@ -15,7 +15,7 @@
#include
//TODO revise or replace this dependency
-#include "../../rtl-sdr/src/rtl_fm.c"
+//#include "../../rtl-sdr/src/rtl_fm.c"
/* defines */