diff --git a/.gitignore b/.gitignore index 85b7e92..371c8d7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,267 +1,5 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - # Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -bld/ [Bb]in/ -[Oo]bj/ -[Ll]og/ - -# Visual Studio 2015 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# DNX -project.lock.json -project.fragment.lock.json -artifacts/ - -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# TODO: Comment the next line if you want to checkin your web deploy settings -# but database connection strings (with potential passwords) will be unencrypted -#*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/packages/* -# except build/, which is used as an MSBuild target. -!**/packages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/packages/repositories.config -# NuGet v3's project.json files produces more ignoreable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -node_modules/ -orleans.codegen.cs - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -*.mdf -*.ldf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# JetBrains Rider -.idea/ -*.sln.iml - -# CodeRush -.cr/ - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -#VisualMicro -__vm/ -#Line endings unifier -.leu \ No newline at end of file +#Visual Studio code +.vscode/ \ No newline at end of file diff --git a/GpsTracker/Alerts.cpp b/Alerts.cpp similarity index 100% rename from GpsTracker/Alerts.cpp rename to Alerts.cpp diff --git a/GpsTracker/Alerts.h b/Alerts.h similarity index 100% rename from GpsTracker/Alerts.h rename to Alerts.h diff --git a/GpsTracker/Config.cpp b/Config.cpp similarity index 100% rename from GpsTracker/Config.cpp rename to Config.cpp diff --git a/GpsTracker/Config.h b/Config.h similarity index 100% rename from GpsTracker/Config.h rename to Config.h diff --git a/GpsTracker/Core.cpp b/Core.cpp similarity index 100% rename from GpsTracker/Core.cpp rename to Core.cpp diff --git a/GpsTracker/Core.h b/Core.h similarity index 100% rename from GpsTracker/Core.h rename to Core.h diff --git a/GpsTracker/Debug.cpp b/Debug.cpp similarity index 100% rename from GpsTracker/Debug.cpp rename to Debug.cpp diff --git a/GpsTracker/Debug.h b/Debug.h similarity index 100% rename from GpsTracker/Debug.h rename to Debug.h diff --git a/GpsTracker/Flash.cpp b/Flash.cpp similarity index 100% rename from GpsTracker/Flash.cpp rename to Flash.cpp diff --git a/GpsTracker/Flash.h b/Flash.h similarity index 100% rename from GpsTracker/Flash.h rename to Flash.h diff --git a/GpsTracker/Gps.cpp b/Gps.cpp similarity index 100% rename from GpsTracker/Gps.cpp rename to Gps.cpp diff --git a/GpsTracker/Gps.h b/Gps.h similarity index 100% rename from GpsTracker/Gps.h rename to Gps.h diff --git a/GpsTracker/GpsTracker.h b/GpsTracker.h similarity index 100% rename from GpsTracker/GpsTracker.h rename to GpsTracker.h diff --git a/GpsTracker/GpsTracker.ino b/GpsTracker.ino similarity index 100% rename from GpsTracker/GpsTracker.ino rename to GpsTracker.ino diff --git a/GpsTracker/~AutoRecover.GpsTracker.vcxproj0 b/GpsTracker/~AutoRecover.GpsTracker.vcxproj0 deleted file mode 100644 index 1555d93..0000000 --- a/GpsTracker/~AutoRecover.GpsTracker.vcxproj0 +++ /dev/null @@ -1,143 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {C5F80730-F44F-4478-BDAE-6634EFC2CA88} - GpsTracker - GpsTracker - - - - Application - true - - - MultiByte - - - Application - false - - - true - MultiByte - - - - - - - - - - - - - - - - - - - - Level3 - Disabled - true - $(ProjectDir)..\GpsTracker;$(ProjectDir)..\..\libraries\E24;$(ProjectDir)..\..\libraries\SIM808;$(ProjectDir)..\..\libraries\uDS3231;$(ProjectDir)..\..\libraries\ArduinoLog;$(ProjectDir)..\..\..\..\..\..\..\..\Program Files (x86)\Arduino\hardware\arduino\avr\libraries\Wire\src;$(ProjectDir)..\..\libraries\Low-Power;$(ProjectDir)..\..\..\..\..\..\..\..\Program Files (x86)\Arduino\hardware\arduino\avr\libraries\SoftwareSerial\src;$(ProjectDir)..\..\libraries\SdFat\src;$(ProjectDir)..\..\..\..\..\..\..\..\Program Files (x86)\Arduino\hardware\arduino\avr\libraries\SPI\src;$(ProjectDir)..\..\..\..\..\..\..\..\Program Files (x86)\Arduino\libraries;$(ProjectDir)..\..\..\..\..\..\..\..\Program Files (x86)\Arduino\hardware\arduino\avr\libraries;$(ProjectDir)..\..\libraries;$(ProjectDir)..\..\..\..\..\..\..\..\Program Files (x86)\Arduino\hardware\arduino\avr\cores\arduino;$(ProjectDir)..\..\..\..\..\..\..\..\Program Files (x86)\Arduino\hardware\arduino\avr\variants\eightanaloginputs;$(ProjectDir)..\..\..\..\..\..\..\..\Program Files (x86)\Arduino\hardware\tools\avr\avr\include\;$(ProjectDir)..\..\..\..\..\..\..\..\Program Files (x86)\Arduino\hardware\tools\avr\avr\include\avr\;$(ProjectDir)..\..\..\..\..\..\..\..\Program Files (x86)\Arduino\hardware\tools\avr\lib\gcc\avr\4.8.1\include;$(ProjectDir)..\..\..\..\..\..\..\..\Program Files (x86)\Arduino\hardware\tools\avr\lib\gcc\avr\4.9.2\include;$(ProjectDir)..\..\..\..\..\..\..\..\Program Files (x86)\Arduino\hardware\tools\avr\lib\gcc\avr\4.9.3\include;%(AdditionalIncludeDirectories) - $(ProjectDir)__vm\.GpsTracker.vsarduino.h;%(ForcedIncludeFiles) - false - __AVR_ATmega328p__;__AVR_ATmega328P__;_DEBUG=1;_VMDEBUG=1;F_CPU=8000000L;ARDUINO=10805;ARDUINO_AVR_PRO;ARDUINO_ARCH_AVR;__cplusplus=201103L;_VMICRO_INTELLISENSE;%(PreprocessorDefinitions) - - - true - - - - - Level3 - Disabled - true - true - true - $(ProjectDir)..\GpsTracker;$(ProjectDir)..\..\libraries\E24;$(ProjectDir)..\..\libraries\SIM808;$(ProjectDir)..\..\libraries\uDS3231;$(ProjectDir)..\..\libraries\ArduinoLog;$(ProjectDir)..\..\..\..\..\..\..\..\Program Files (x86)\Arduino\hardware\arduino\avr\libraries\SoftwareSerial\src;$(ProjectDir)..\..\..\..\..\..\..\..\Program Files (x86)\Arduino\hardware\arduino\avr\libraries\Wire\src;$(ProjectDir)..\..\libraries\Low-Power;$(ProjectDir)..\..\libraries\SdFat\src;$(ProjectDir)..\..\..\..\..\..\..\..\Program Files (x86)\Arduino\hardware\arduino\avr\libraries\SPI\src;$(ProjectDir)..\..\..\..\..\..\..\..\Program Files (x86)\Arduino\hardware\arduino\avr\libraries\Wire\src\utility;$(ProjectDir)..\..\..\..\..\..\..\..\Program Files (x86)\Arduino\libraries;$(ProjectDir)..\..\..\..\..\..\..\..\Program Files (x86)\Arduino\hardware\arduino\avr\libraries;$(ProjectDir)..\..\libraries;$(ProjectDir)..\..\..\..\..\..\..\..\Program Files (x86)\Arduino\hardware\arduino\avr\cores\arduino;$(ProjectDir)..\..\..\..\..\..\..\..\Program Files (x86)\Arduino\hardware\arduino\avr\variants\eightanaloginputs;$(ProjectDir)..\..\..\..\..\..\..\..\Program Files (x86)\Arduino\hardware\tools\avr\avr\include\;$(ProjectDir)..\..\..\..\..\..\..\..\Program Files (x86)\Arduino\hardware\tools\avr\avr\include\avr\;$(ProjectDir)..\..\..\..\..\..\..\..\Program Files (x86)\Arduino\hardware\tools\avr\lib\gcc\avr\4.8.1\include;$(ProjectDir)..\..\..\..\..\..\..\..\Program Files (x86)\Arduino\hardware\tools\avr\lib\gcc\avr\4.9.2\include;$(ProjectDir)..\..\..\..\..\..\..\..\Program Files (x86)\Arduino\hardware\tools\avr\lib\gcc\avr\4.9.3\include;%(AdditionalIncludeDirectories) - $(ProjectDir)__vm\.GpsTracker.vsarduino.h;%(ForcedIncludeFiles) - false - __AVR_ATmega328p__;__AVR_ATmega328P__;F_CPU=8000000L;ARDUINO=10805;ARDUINO_AVR_PRO;ARDUINO_ARCH_AVR;__cplusplus=201103L;_VMICRO_INTELLISENSE;%(PreprocessorDefinitions) - - - true - true - true - - - - - - - VisualMicroDebugger - - - - CppCode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/GpsTracker/Hardware.cpp b/Hardware.cpp similarity index 100% rename from GpsTracker/Hardware.cpp rename to Hardware.cpp diff --git a/GpsTracker/Hardware.h b/Hardware.h similarity index 100% rename from GpsTracker/Hardware.h rename to Hardware.h diff --git a/GpsTracker/Logging.cpp b/Logging.cpp similarity index 100% rename from GpsTracker/Logging.cpp rename to Logging.cpp diff --git a/GpsTracker/Logging.h b/Logging.h similarity index 100% rename from GpsTracker/Logging.h rename to Logging.h diff --git a/GpsTracker/MainUnit.cpp b/MainUnit.cpp similarity index 100% rename from GpsTracker/MainUnit.cpp rename to MainUnit.cpp diff --git a/GpsTracker/MainUnit.h b/MainUnit.h similarity index 100% rename from GpsTracker/MainUnit.h rename to MainUnit.h diff --git a/GpsTracker/Network.cpp b/Network.cpp similarity index 100% rename from GpsTracker/Network.cpp rename to Network.cpp diff --git a/GpsTracker/Network.h b/Network.h similarity index 100% rename from GpsTracker/Network.h rename to Network.h diff --git a/GpsTracker/NetworkPositionsBackup.cpp b/NetworkPositionsBackup.cpp similarity index 100% rename from GpsTracker/NetworkPositionsBackup.cpp rename to NetworkPositionsBackup.cpp diff --git a/GpsTracker/NetworkPositionsBackup.h b/NetworkPositionsBackup.h similarity index 100% rename from GpsTracker/NetworkPositionsBackup.h rename to NetworkPositionsBackup.h diff --git a/GpsTracker/NetworkPositionsConfig.h b/NetworkPositionsConfig.h similarity index 100% rename from GpsTracker/NetworkPositionsConfig.h rename to NetworkPositionsConfig.h diff --git a/GpsTracker/Pins.h b/Pins.h similarity index 100% rename from GpsTracker/Pins.h rename to Pins.h diff --git a/GpsTracker/Positions.cpp b/Positions.cpp similarity index 100% rename from GpsTracker/Positions.cpp rename to Positions.cpp diff --git a/GpsTracker/Positions.h b/Positions.h similarity index 100% rename from GpsTracker/Positions.h rename to Positions.h diff --git a/GpsTracker/PositionsBackup.cpp b/PositionsBackup.cpp similarity index 100% rename from GpsTracker/PositionsBackup.cpp rename to PositionsBackup.cpp diff --git a/GpsTracker/PositionsBackup.h b/PositionsBackup.h similarity index 100% rename from GpsTracker/PositionsBackup.h rename to PositionsBackup.h diff --git a/GpsTracker/Rtc.cpp b/Rtc.cpp similarity index 95% rename from GpsTracker/Rtc.cpp rename to Rtc.cpp index 26d8b45..861e3a2 100644 --- a/GpsTracker/Rtc.cpp +++ b/Rtc.cpp @@ -11,7 +11,7 @@ using namespace utils; namespace rtc { - + void setup() { VERBOSE("setup"); hardware::i2c::powerOn(); @@ -19,8 +19,6 @@ namespace rtc { RTC.control(DS3231_A1_INT_ENABLE, DS3231_OFF); //Alarm 1 OFF RTC.control(DS3231_INT_ENABLE, DS3231_ON); //INTCN ON hardware::i2c::powerOff(); - - //TODO : check wether the osc has been halted (meaning the battery could be dead) } float getTemperature() { diff --git a/GpsTracker/Rtc.h b/Rtc.h similarity index 100% rename from GpsTracker/Rtc.h rename to Rtc.h diff --git a/GpsTracker/SdCard.cpp b/SdCard.cpp similarity index 100% rename from GpsTracker/SdCard.cpp rename to SdCard.cpp diff --git a/GpsTracker/SdCard.h b/SdCard.h similarity index 100% rename from GpsTracker/SdCard.h rename to SdCard.h diff --git a/GpsTracker/SdPositionsBackup.cpp b/SdPositionsBackup.cpp similarity index 100% rename from GpsTracker/SdPositionsBackup.cpp rename to SdPositionsBackup.cpp diff --git a/GpsTracker/SdPositionsBackup.h b/SdPositionsBackup.h similarity index 100% rename from GpsTracker/SdPositionsBackup.h rename to SdPositionsBackup.h diff --git a/GpsTracker/SdPositionsConfig.cpp b/SdPositionsConfig.cpp similarity index 100% rename from GpsTracker/SdPositionsConfig.cpp rename to SdPositionsConfig.cpp diff --git a/GpsTracker/SdPositionsConfig.h b/SdPositionsConfig.h similarity index 100% rename from GpsTracker/SdPositionsConfig.h rename to SdPositionsConfig.h diff --git a/GpsTracker/Time2.cpp b/Time2.cpp similarity index 100% rename from GpsTracker/Time2.cpp rename to Time2.cpp diff --git a/GpsTracker/Time2.h b/Time2.h similarity index 100% rename from GpsTracker/Time2.h rename to Time2.h