diff --git a/.cproject b/.cproject index 0d6f803..08d110b 100644 --- a/.cproject +++ b/.cproject @@ -28,9 +28,16 @@ + + + - + @@ -98,8 +108,13 @@ + + + + + @@ -107,6 +122,4 @@ - - diff --git a/PiScan.exe.stackdump b/PiScan.exe.stackdump deleted file mode 100644 index 7fb3be3..0000000 --- a/PiScan.exe.stackdump +++ /dev/null @@ -1,17 +0,0 @@ -Exception: STATUS_ACCESS_VIOLATION at rip=001004021C1 -rax=0000000000000000 rbx=00000000FFFFCC00 rcx=000000010040500E -rdx=0000000100405000 rsi=0000000180252AA0 rdi=0000000000008000 -r8 =0000000000000000 r9 =0000000000000000 r10=00000000FFFFCA40 -r11=0000000180045F95 r12=00000000FFFFCC20 r13=00000000FFFFCC56 -r14=0000000000000000 r15=000000018021E3F0 -rbp=00000000FFFFCB90 rsp=00000000FFFFCB10 -program=D:\kidsr\Documents\GitHub\PiScan\Unit Test\PiScan.exe, pid 38928, thread main -cs=0033 ds=002B es=002B fs=0053 gs=002B ss=002B -Stack trace: -Frame Function Args -000FFFFCB90 001004021C1 (00100405000, 000FFFFCCB0, 000FFFFCC20, 000FFFFCC56) -000FFFFCBB0 001004010A0 (00000000020, 70700000006FF00, 00180047941, 00000000000) -000FFFFCCB0 001800479B2 (00000000000, 00000000000, 00000000000, 00000000000) -00000000000 00180045653 (00000000000, 00000000000, 00000000000, 00000000000) -000FFFFFFF0 00180045704 (00000000000, 00000000000, 00000000000, 00000000000) -End of stack trace diff --git a/PiScan.sln b/PiScan.sln deleted file mode 100644 index 8d76b4d..0000000 --- a/PiScan.sln +++ /dev/null @@ -1,38 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Unit Tests", "tests\Unit Tests.vcxproj", "{207456E3-BD92-40E1-BE5B-E3872D9CC46F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Main", "src\Main.vcxproj", "{BCA3F562-EE0A-47EA-AABE-6238FE08BFFF}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {207456E3-BD92-40E1-BE5B-E3872D9CC46F}.Debug|x64.ActiveCfg = Debug|x64 - {207456E3-BD92-40E1-BE5B-E3872D9CC46F}.Debug|x64.Build.0 = Debug|x64 - {207456E3-BD92-40E1-BE5B-E3872D9CC46F}.Debug|x86.ActiveCfg = Debug|Win32 - {207456E3-BD92-40E1-BE5B-E3872D9CC46F}.Debug|x86.Build.0 = Debug|Win32 - {207456E3-BD92-40E1-BE5B-E3872D9CC46F}.Release|x64.ActiveCfg = Release|x64 - {207456E3-BD92-40E1-BE5B-E3872D9CC46F}.Release|x64.Build.0 = Release|x64 - {207456E3-BD92-40E1-BE5B-E3872D9CC46F}.Release|x86.ActiveCfg = Release|Win32 - {207456E3-BD92-40E1-BE5B-E3872D9CC46F}.Release|x86.Build.0 = Release|Win32 - {BCA3F562-EE0A-47EA-AABE-6238FE08BFFF}.Debug|x64.ActiveCfg = Debug|x64 - {BCA3F562-EE0A-47EA-AABE-6238FE08BFFF}.Debug|x64.Build.0 = Debug|x64 - {BCA3F562-EE0A-47EA-AABE-6238FE08BFFF}.Debug|x86.ActiveCfg = Debug|Win32 - {BCA3F562-EE0A-47EA-AABE-6238FE08BFFF}.Debug|x86.Build.0 = Debug|Win32 - {BCA3F562-EE0A-47EA-AABE-6238FE08BFFF}.Release|x64.ActiveCfg = Release|x64 - {BCA3F562-EE0A-47EA-AABE-6238FE08BFFF}.Release|x64.Build.0 = Release|x64 - {BCA3F562-EE0A-47EA-AABE-6238FE08BFFF}.Release|x86.ActiveCfg = Release|Win32 - {BCA3F562-EE0A-47EA-AABE-6238FE08BFFF}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/PiScan.vcxproj b/PiScan.vcxproj deleted file mode 100644 index d690948..0000000 --- a/PiScan.vcxproj +++ /dev/null @@ -1,140 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {BC4C4C8C-ABCD-42F5-AAB6-A41D0264C02D} - Win32Proj - - - - Application - true - v140 - - - Application - false - v140 - - - Application - true - v140 - - - Application - false - v140 - - - - - - - - - - - - - - - - - - - - - true - - - true - - - - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - Level3 - ProgramDatabase - Disabled - - - MachineX86 - true - Windows - - - - - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDLL - Level3 - ProgramDatabase - - - MachineX86 - true - Windows - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/PiScan.vcxproj.filters b/PiScan.vcxproj.filters deleted file mode 100644 index a1ddb8c..0000000 --- a/PiScan.vcxproj.filters +++ /dev/null @@ -1,123 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/PiScan/PiScan.sln b/PiScan/PiScan.sln deleted file mode 100644 index 8e2e9ef..0000000 --- a/PiScan/PiScan.sln +++ /dev/null @@ -1,45 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PiScan", "PiScan.vcxproj", "{D2CC9305-97B6-4C3A-84A5-CC8110634B97}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A2E67A1E-32F1-401A-B23C-21B27A28A3A2}" - ProjectSection(SolutionItems) = preProject - ..\.cproject = ..\.cproject - ..\.gitattributes = ..\.gitattributes - ..\.gitignore = ..\.gitignore - ..\.project = ..\.project - ..\graphic_lcd.fifo = ..\graphic_lcd.fifo - ..\README.md = ..\README.md - ..\Test profile 1.sp = ..\Test profile 1.sp - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|ARM = Release|ARM - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D2CC9305-97B6-4C3A-84A5-CC8110634B97}.Debug|ARM.ActiveCfg = Debug|ARM - {D2CC9305-97B6-4C3A-84A5-CC8110634B97}.Debug|ARM.Build.0 = Debug|ARM - {D2CC9305-97B6-4C3A-84A5-CC8110634B97}.Debug|x64.ActiveCfg = Debug|x64 - {D2CC9305-97B6-4C3A-84A5-CC8110634B97}.Debug|x64.Build.0 = Debug|x64 - {D2CC9305-97B6-4C3A-84A5-CC8110634B97}.Debug|x86.ActiveCfg = Debug|x86 - {D2CC9305-97B6-4C3A-84A5-CC8110634B97}.Debug|x86.Build.0 = Debug|x86 - {D2CC9305-97B6-4C3A-84A5-CC8110634B97}.Release|ARM.ActiveCfg = Release|ARM - {D2CC9305-97B6-4C3A-84A5-CC8110634B97}.Release|ARM.Build.0 = Release|ARM - {D2CC9305-97B6-4C3A-84A5-CC8110634B97}.Release|x64.ActiveCfg = Release|x64 - {D2CC9305-97B6-4C3A-84A5-CC8110634B97}.Release|x64.Build.0 = Release|x64 - {D2CC9305-97B6-4C3A-84A5-CC8110634B97}.Release|x86.ActiveCfg = Release|x86 - {D2CC9305-97B6-4C3A-84A5-CC8110634B97}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/PiScan/PiScan.vcxproj b/PiScan/PiScan.vcxproj deleted file mode 100644 index 374af6d..0000000 --- a/PiScan/PiScan.vcxproj +++ /dev/null @@ -1,68 +0,0 @@ - - - - - Debug - ARM - - - Release - ARM - - - Debug - x86 - - - Release - x86 - - - Debug - x64 - - - Release - x64 - - - - {d2cc9305-97b6-4c3a-84a5-cc8110634b97} - Linux - PiScan - 14.0 - Linux - 1.0 - Generic - {2238F9CD-F817-4ECC-BD14-2524D2669B35} - - - - true - - - false - - - true - - - false - - - true - - - false - - - - - - - - - - - - \ No newline at end of file diff --git a/src/debug.h b/include/debug.h similarity index 100% rename from src/debug.h rename to include/debug.h diff --git a/src/event.h b/include/event.h similarity index 100% rename from src/event.h rename to include/event.h diff --git a/src/gpio.h b/include/gpio.h similarity index 100% rename from src/gpio.h rename to include/gpio.h diff --git a/src/interface.h b/include/interface.h similarity index 100% rename from src/interface.h rename to include/interface.h diff --git a/src/interface/display/graphic_lcd.h b/include/interface/graphic_lcd.h similarity index 100% rename from src/interface/display/graphic_lcd.h rename to include/interface/graphic_lcd.h diff --git a/src/interface/display/graphic_lcd/display.h b/include/interface/graphic_lcd/display.h similarity index 94% rename from src/interface/display/graphic_lcd/display.h rename to include/interface/graphic_lcd/display.h index aa0d60d..ebc3982 100644 --- a/src/interface/display/graphic_lcd/display.h +++ b/include/interface/graphic_lcd/display.h @@ -4,15 +4,17 @@ * Created on: Jun 9, 2018 * Author: kidsr */ -#include -#include "../../../debug.h" - -#define DISPLAY_TAG "Display driver" #ifndef SRC_DISPLAY_GRAPHIC_LCD_DISPLAY_H_ #define SRC_DISPLAY_GRAPHIC_LCD_DISPLAY_H_ +#include + +#include "debug.h" + +#define DISPLAY_TAG "Display driver" + typedef struct display { int height; int width; diff --git a/src/interface/display/graphic_lcd/drv_pipe.h b/include/interface/graphic_lcd/drv_pipe.h similarity index 100% rename from src/interface/display/graphic_lcd/drv_pipe.h rename to include/interface/graphic_lcd/drv_pipe.h diff --git a/src/interface/display/graphic_lcd/font.h b/include/interface/graphic_lcd/font.h similarity index 100% rename from src/interface/display/graphic_lcd/font.h rename to include/interface/graphic_lcd/font.h diff --git a/src/interface/display/graphic_lcd/font_6x8.h b/include/interface/graphic_lcd/font_6x8.h similarity index 100% rename from src/interface/display/graphic_lcd/font_6x8.h rename to include/interface/graphic_lcd/font_6x8.h diff --git a/src/interface/display/graphic_lcd/font_6x8_bold.h b/include/interface/graphic_lcd/font_6x8_bold.h similarity index 100% rename from src/interface/display/graphic_lcd/font_6x8_bold.h rename to include/interface/graphic_lcd/font_6x8_bold.h diff --git a/src/interface/display/graphic_lcd/font_lucida16pt.h b/include/interface/graphic_lcd/font_lucida16pt.h similarity index 100% rename from src/interface/display/graphic_lcd/font_lucida16pt.h rename to include/interface/graphic_lcd/font_lucida16pt.h diff --git a/src/interface/display/graphic_lcd/font_lucida7pt.h b/include/interface/graphic_lcd/font_lucida7pt.h similarity index 100% rename from src/interface/display/graphic_lcd/font_lucida7pt.h rename to include/interface/graphic_lcd/font_lucida7pt.h diff --git a/src/interface/display/graphic_lcd/font_lucida8pt.h b/include/interface/graphic_lcd/font_lucida8pt.h similarity index 100% rename from src/interface/display/graphic_lcd/font_lucida8pt.h rename to include/interface/graphic_lcd/font_lucida8pt.h diff --git a/include/libusb-compat-0.1 b/include/libusb-compat-0.1 new file mode 160000 index 0000000..2e98446 --- /dev/null +++ b/include/libusb-compat-0.1 @@ -0,0 +1 @@ +Subproject commit 2e9844673c8f2a326261bc5207c4a9d75c6d85bc diff --git a/src/scan_tree.h b/include/scan_tree.h similarity index 100% rename from src/scan_tree.h rename to include/scan_tree.h diff --git a/src/scanner.h b/include/scanner.h similarity index 84% rename from src/scanner.h rename to include/scanner.h index 23abcd6..360e278 100644 --- a/src/scanner.h +++ b/include/scanner.h @@ -11,6 +11,7 @@ #include #include "interface.h" +//#include "tuner.h" #define SCANNER_TAG "Scanner" #define SCANNER_SVC_TAG "Scanner Service" @@ -21,7 +22,7 @@ int scanner_init(void *p_profile); int scanner_thread_fn(); -void analog_scan(const struct system *sys, struct tuning_interface *tuner); +void analog_scan(const struct system *sys); void p25_scan(struct system *sys); void dmr_scan(struct system *sys); diff --git a/src/tuner.h b/include/tuner.h similarity index 88% rename from src/tuner.h rename to include/tuner.h index fb1369d..72bec46 100644 --- a/src/tuner.h +++ b/include/tuner.h @@ -11,7 +11,7 @@ #include //#include "../../rtl-sdr/src/rtl_fm.c" -#include "../../rtl-sdr/include/rtl-sdr.h" +//#include "../../rtl-sdr/include/rtl-sdr.h" #include "scan_tree.h" //pthread_t tuner_thread; diff --git a/src/Main.sln b/src/Main.sln deleted file mode 100644 index f971ffe..0000000 --- a/src/Main.sln +++ /dev/null @@ -1,28 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Main", "Main.vcxproj", "{BCA3F562-EE0A-47EA-AABE-6238FE08BFFF}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BCA3F562-EE0A-47EA-AABE-6238FE08BFFF}.Debug|x64.ActiveCfg = Debug|x64 - {BCA3F562-EE0A-47EA-AABE-6238FE08BFFF}.Debug|x64.Build.0 = Debug|x64 - {BCA3F562-EE0A-47EA-AABE-6238FE08BFFF}.Debug|x86.ActiveCfg = Debug|Win32 - {BCA3F562-EE0A-47EA-AABE-6238FE08BFFF}.Debug|x86.Build.0 = Debug|Win32 - {BCA3F562-EE0A-47EA-AABE-6238FE08BFFF}.Release|x64.ActiveCfg = Release|x64 - {BCA3F562-EE0A-47EA-AABE-6238FE08BFFF}.Release|x64.Build.0 = Release|x64 - {BCA3F562-EE0A-47EA-AABE-6238FE08BFFF}.Release|x86.ActiveCfg = Release|Win32 - {BCA3F562-EE0A-47EA-AABE-6238FE08BFFF}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/src/Main.vcxproj b/src/Main.vcxproj deleted file mode 100644 index 42d80f2..0000000 --- a/src/Main.vcxproj +++ /dev/null @@ -1,137 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {BCA3F562-EE0A-47EA-AABE-6238FE08BFFF} - Win32Proj - - - - Application - true - v140 - - - Application - false - v140 - - - Application - true - v140 - - - Application - false - v140 - - - - - - - - - - - - - - - - - - - - - true - - - true - - - - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - Level3 - ProgramDatabase - Disabled - - - MachineX86 - true - Console - - - - - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - Level3 - ProgramDatabase - - - MachineX86 - true - Console - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Main.vcxproj.filters b/src/Main.vcxproj.filters deleted file mode 100644 index ec7801a..0000000 --- a/src/Main.vcxproj.filters +++ /dev/null @@ -1,114 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/src/interface/display/driver/drv_MatrixOrbitalGX.c b/src/interface/display/driver/drv_MatrixOrbitalGX.c index 10501ca..6f4d37f 100644 --- a/src/interface/display/driver/drv_MatrixOrbitalGX.c +++ b/src/interface/display/driver/drv_MatrixOrbitalGX.c @@ -49,8 +49,9 @@ //#include //#include -#include -//#include +//#include +#include "libusb-compat-0.1/libusb/usb.h" +//#include "usb.h" /* #include "debug.h" #include "cfg.h" diff --git a/src/interface/display/graphic_lcd/drv_pipe.c b/src/interface/display/graphic_lcd/drv_pipe.c index 1e0a3ed..191e296 100644 --- a/src/interface/display/graphic_lcd/drv_pipe.c +++ b/src/interface/display/graphic_lcd/drv_pipe.c @@ -18,7 +18,7 @@ #include #endif -#include "display.h" +#include "interface/graphic_lcd/display.h" static DISPLAY *disp; static const char fifo_name[] = "./graphic_lcd.fifo"; diff --git a/src/interface/display/graphic_lcd/font_lucida16pt.c b/src/interface/display/graphic_lcd/font_lucida16pt.c index 96291fe..fe45cdc 100644 --- a/src/interface/display/graphic_lcd/font_lucida16pt.c +++ b/src/interface/display/graphic_lcd/font_lucida16pt.c @@ -11,7 +11,7 @@ #endif*/ //#include "font.h" -#include "font_lucida16pt.h" +#include "interface/graphic_lcd/font_lucida16pt.h" /* Font information for Lucida Console 16pt */ const FONT_INFO lucidaConsole_16ptFontInfo = diff --git a/src/interface/display/graphic_lcd/font_lucida7pt.c b/src/interface/display/graphic_lcd/font_lucida7pt.c index 8e8671b..13aa497 100644 --- a/src/interface/display/graphic_lcd/font_lucida7pt.c +++ b/src/interface/display/graphic_lcd/font_lucida7pt.c @@ -1,7 +1,7 @@ /* ** Font data for Lucida Console 7pt */ -#include "font_lucida7pt.h" +#include "interface/graphic_lcd/font_lucida7pt.h" /* Font information for Lucida Console 7pt */ const FONT_INFO lucidaConsole_7ptFontInfo = diff --git a/src/interface/display/graphic_lcd/font_lucida8pt.c b/src/interface/display/graphic_lcd/font_lucida8pt.c index 70e59e8..1be21d2 100644 --- a/src/interface/display/graphic_lcd/font_lucida8pt.c +++ b/src/interface/display/graphic_lcd/font_lucida8pt.c @@ -5,7 +5,7 @@ //#include //#include "font.h" -#include "font_lucida8pt.h" +#include "interface/graphic_lcd/font_lucida8pt.h" const FONT_INFO lucidaConsole_8ptFontInfo = { diff --git a/src/interface/display/graphic_lcd/graphic_lcd.c b/src/interface/display/graphic_lcd/graphic_lcd.c index f963edd..c556428 100644 --- a/src/interface/display/graphic_lcd/graphic_lcd.c +++ b/src/interface/display/graphic_lcd/graphic_lcd.c @@ -14,11 +14,11 @@ #include #include -#include "../graphic_lcd.h" -#include "font.h" +#include "interface/graphic_lcd.h" +#include "interface/graphic_lcd/font.h" //#include "font_lucida16pt.h" //#include "font_lucida8pt.h" -#include "display.h" +#include "interface/graphic_lcd/display.h" /* Clears the frame buffer */ void clear_frame(void *pdisp){ diff --git a/src/interface/int_MatrixOrbitalGX_GPIO.c b/src/interface/int_MatrixOrbitalGX_GPIO.c index 17c1a34..407a414 100644 --- a/src/interface/int_MatrixOrbitalGX_GPIO.c +++ b/src/interface/int_MatrixOrbitalGX_GPIO.c @@ -11,9 +11,9 @@ #include -#include "../interface.h" -#include "display/graphic_lcd/display.h" -#include "display/graphic_lcd.h" +#include "interface.h" +#include "interface/graphic_lcd/display.h" +#include "interface/graphic_lcd.h" DISPLAY *disp = &disp_MatrixOrbitalGX; diff --git a/src/piscan.c b/src/piscan.c index 232447a..578b66e 100644 --- a/src/piscan.c +++ b/src/piscan.c @@ -13,7 +13,7 @@ //#include //TODO revise or replace this dependency -#include "../../rtl-sdr/src/rtl_fm.c" +//#include "../../rtl-sdr/src/rtl_fm.c" #include "debug.h" #include "event.h" diff --git a/src/scanner.c b/src/scanner.c index fdd3c3b..b8b280f 100644 --- a/src/scanner.c +++ b/src/scanner.c @@ -15,12 +15,13 @@ #include #include -#include "../../rtl-sdr/src/rtl_fm.c" -#include "../../rtl-sdr/include/rtl-sdr.h" +//#include "../../rtl-sdr/src/rtl_fm.c" +//#include "../../rtl-sdr/include/rtl-sdr.h" #include "scan_tree.h" #include "scanner.h" #include "debug.h" +#include "tuner.h" /* Constants */ #define SCAN_DELAY_TIMEOUT 2000 //2000ms timeout @@ -29,41 +30,41 @@ /* Methods */ -void broadcast_scan_event(enum scan_event){ +/*void broadcast_scan_event(enum scan_event){ -} +}*/ -void analog_scan(const struct system *sys, struct tuning_interface *tuner){ +void analog_scan(const RADIO_SYSTEM *sys){ for(int cur = 0; cur < sys->channel_count; cur++) { // TODO code for updating interface fprintf(stderr, "Scanning %s\n", sys->tag); // TODO thread sync - tuner->dongle->freq = sys->channels[cur]->freq; + //tuner->dongle->freq = sys->channels[cur]->freq; switch(sys->channels[cur]->mode){ case AM: - tuner->demod->mode_demod = &am_demod; + //tuner->demod->mode_demod = &am_demod; break; case NFM: case FM: default: - tuner->demod->mode_demod = &fm_demod; + //tuner->demod->mode_demod = &fm_demod; break; } - while(!tuner->tuned); + //while(!tuner->tuned); //if(tuner->demod->) } } -void p25_scan(struct system *sys){ +void p25_scan(RADIO_SYSTEM *sys){ // TODO for future implementation } -void dmr_scan(struct system *sys){ +void dmr_scan(RADIO_SYSTEM *sys){ // TODO for future implementation } diff --git a/tests/test_event_service.c b/tests/test_event_service.c index 4b1f69e..0503f86 100644 --- a/tests/test_event_service.c +++ b/tests/test_event_service.c @@ -8,8 +8,8 @@ #include #include -#include "../src/debug.h" -#include "../src/event.h" +#include "debug.h" +#include "event.h" #define TEST_TAG "Event test" diff --git a/tests/test_graphic_lcd.c b/tests/test_graphic_lcd.c index b01cc67..1ffd1f2 100644 --- a/tests/test_graphic_lcd.c +++ b/tests/test_graphic_lcd.c @@ -13,9 +13,9 @@ #include #include -#include "../src/interface/display/graphic_lcd.h" -#include "../src/interface/display/graphic_lcd/display.h" -#include "../src/interface/display/graphic_lcd/font.h" +#include "interface/graphic_lcd.h" +#include "interface/graphic_lcd/display.h" +#include "interface/graphic_lcd/font.h" int main(){ diff --git a/tests/test_scan_tree.c b/tests/test_scan_tree.c index 37fc93a..6a3e0a9 100644 --- a/tests/test_scan_tree.c +++ b/tests/test_scan_tree.c @@ -14,7 +14,7 @@ #include #include -#include "../src/scan_tree.h" +#include "scan_tree.h" struct scan_profile generated_profile;