Skip to content

Commit

Permalink
Merge branch 'develop-lwgps' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
MaJerle committed Jul 3, 2020
2 parents 2d59623 + 63992d8 commit 8ea618b
Show file tree
Hide file tree
Showing 22 changed files with 390 additions and 394 deletions.
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# GPS NMEA 0183 Parser
# Lightweiht GPS NMEA parser

Platform independent GPS NMEA parser for embedded systems.

<h3>Read first: <a href="http://docs.majerle.eu/projects/gps-nmea-parser/">Documentation</a></h3>
<h3>Read first: <a href="http://docs.majerle.eu/projects/lwgps/">Documentation</a></h3>

## Features

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28803.452
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gps_nmea_parser_dev", "gps_nmea_parser_dev.vcxproj", "{C7C465FB-17B3-4226-BBD5-E79C1B3796C6}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lwgps_dev", "lwgps_dev.vcxproj", "{C7C465FB-17B3-4226-BBD5-E79C1B3796C6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<VCProjectVersion>15.0</VCProjectVersion>
<ProjectGuid>{C7C465FB-17B3-4226-BBD5-E79C1B3796C6}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>GPS_NMEA_Parser</RootNamespace>
<RootNamespace>LwGPS</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
Expand Down Expand Up @@ -72,7 +72,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>.;..\..\GPS_NMEA_Parser\src\include;$(IncludePath)</IncludePath>
<IncludePath>.;..\..\lwgps\src\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
Expand Down Expand Up @@ -140,7 +140,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\examples\test_code.c" />
<ClCompile Include="..\..\GPS_NMEA_Parser\src\gps\gps.c" />
<ClCompile Include="..\..\lwgps\src\lwgps\lwgps.c" />
<ClCompile Include="main.c" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Source Files\GPS">
<Filter Include="Source Files\LwGPS">
<UniqueIdentifier>{d2afbed4-545f-40e7-bf68-d835c5948bcc}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\GPS_NMEA_Parser\src\gps\gps.c">
<Filter>Source Files\GPS</Filter>
<ClCompile Include="..\..\lwgps\src\lwgps\lwgps.c">
<Filter>Source Files\LwGPS</Filter>
</ClCompile>
<ClCompile Include="main.c">
<Filter>Source Files</Filter>
Expand Down
2 changes: 1 addition & 1 deletion dev/VisualStudio/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
* This example uses direct processing function,
* to process dummy NMEA data from GPS receiver
*/
#include "gps/gps.h"
#include <string.h>
#include <stdio.h>
#include <math.h>
#include "lwgps/lwgps.h"

/* External function */
extern void run_tests();
Expand Down
4 changes: 2 additions & 2 deletions docs/api-reference/gps.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.. _api_gps:
.. _api_lwgps:

GPS NMEA Parser
===============

.. doxygengroup:: GPS_NMEA
.. doxygengroup:: LWGPS
6 changes: 3 additions & 3 deletions docs/api-reference/gps_opt.rst
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.. _api_gps_config:
.. _api_lwgps_config:

GPS Configuration
=================

This is the default configuration of the middleware.
When any of the settings shall be modified, it shall be done in library header file, ``gps_nmea_parser/src/include/ow/ow.h``
When any of the settings shall be modified, it shall be done in library header file, ``lwgps/src/include/lwgps/lwgps.h``

.. doxygengroup:: GPS_NMEA_CONFIG
.. doxygengroup:: LWGPS_CONFIG
14 changes: 7 additions & 7 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
subprocess.call('doxygen doxyfile.doxy', shell=True)
# -- Project information -----------------------------------------------------

project = 'GPS NMEA Parser'
project = 'LwGPS'
copyright = '2020, Tilen MAJERLE'
author = 'Tilen MAJERLE'

Expand All @@ -38,7 +38,7 @@
git_branch = line[1:].strip()

# Decision for display version
try:
try:
if git_branch.index('develop') >= 0:
version = "latest-develop"
except Exception:
Expand Down Expand Up @@ -89,7 +89,7 @@
'display_version': True,
'prev_next_buttons_location': 'bottom',
'style_external_links': False,

'logo_only': False,

# Toc options
Expand All @@ -100,8 +100,8 @@
'titles_only': False
}
html_logo = 'static/images/logo_tm.png'
github_url = 'https://github.com/MaJerle/gps-nmea-parser'
html_baseurl = 'https://docs.majerle.eu/projects/gps-nmea-parser/'
github_url = 'https://github.com/MaJerle/lwgps'
html_baseurl = 'https://docs.majerle.eu/projects/lwgps/'

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
Expand All @@ -123,7 +123,7 @@
#
#
breathe_projects = {
"gps_nmea_parser": "_build/xml/"
"lwgps": "_build/xml/"
}
breathe_default_project = "gps_nmea_parser"
breathe_default_project = "lwgps"
breathe_default_members = ('members', 'undoc-members')

0 comments on commit 8ea618b

Please sign in to comment.