diff options
| author | Stanley Huang <stanleyhuangyc@gmail.com> | 2016-01-21 00:00:18 +1100 |
|---|---|---|
| committer | Stanley Huang <stanleyhuangyc@gmail.com> | 2016-01-21 00:00:18 +1100 |
| commit | f6156668a658838305ba11335e054f408245f1ad (patch) | |
| tree | 4bad593c3162dc81a0c344de2bd0983092ced982 | |
| parent | 8a1df795ab60444117d32fe139caa476e431f90a (diff) | |
| download | 2021-arduino-obd-f6156668a658838305ba11335e054f408245f1ad.tar.gz 2021-arduino-obd-f6156668a658838305ba11335e054f408245f1ad.tar.bz2 2021-arduino-obd-f6156668a658838305ba11335e054f408245f1ad.zip | |
Sync with latest data logging format
| -rw-r--r-- | utilities/data2kml/data2kml.vcxproj | 6 | ||||
| -rw-r--r-- | utilities/data2kml/kmlhead.txt | 4 | ||||
| -rw-r--r-- | utilities/data2kml/logdata.h | 19 |
3 files changed, 8 insertions, 21 deletions
diff --git a/utilities/data2kml/data2kml.vcxproj b/utilities/data2kml/data2kml.vcxproj index 6911892..96245bb 100644 --- a/utilities/data2kml/data2kml.vcxproj +++ b/utilities/data2kml/data2kml.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -19,13 +19,13 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v110_xp</PlatformToolset> + <PlatformToolset>v140_xp</PlatformToolset> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> diff --git a/utilities/data2kml/kmlhead.txt b/utilities/data2kml/kmlhead.txt index 93334b1..6a93e82 100644 --- a/utilities/data2kml/kmlhead.txt +++ b/utilities/data2kml/kmlhead.txt @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <kml xmlns="http://www.opengis.net/kml/2.2" xmlns:gx="http://www.google.com/kml/ext/2.2"> <Document> -<name>OBD-II/GPS Data Logger</name> +<name>Freematics Vehicle Data Logger</name> <Style id="brakepoint"> <BalloonStyle> <text><strong>Brakepoint</strong><br/> @@ -154,6 +154,6 @@ <Folder> <name>Tracks</name> <Placemark> - <name>Main Track</name> + <name>Main Route</name> <styleUrl>#multiTrack</styleUrl> <gx:Track> diff --git a/utilities/data2kml/logdata.h b/utilities/data2kml/logdata.h index 499ad10..f9ff772 100644 --- a/utilities/data2kml/logdata.h +++ b/utilities/data2kml/logdata.h @@ -15,10 +15,6 @@ #define PID_RUNTIME 0x11F #define PID_DISTANCE 0x131 -#define PID_TIME_DATE 0xF001 -#define PID_TIME_TIME 0xF002 -#define PID_TIME_PLAY_SPEED 0xF003 - #define PID_STAT_0_60 0xF100 #define PID_STAT_0_100 0xF101 #define PID_STAT_0_160 0xF102 @@ -47,16 +43,6 @@ enum { PID_STAT_ACC_BACKWARD, }; -enum { - PID_LOCAL_DATA = 0xF300, - PID_LOCAL_RATE, - PID_REMOTE_DATA, - PID_REMOTE_RATE, - PID_TIME_REMAIN, - PID_BATTERY, - PID_DEVICE_TEMP, -}; - #define PID_GPS_LATITUDE 0xA #define PID_GPS_LONGITUDE 0xB #define PID_GPS_ALTITUDE 0xC @@ -68,8 +54,9 @@ enum { #define PID_ACC 0x20 #define PID_GYRO 0x21 - -#define PID_VIDEO_FRAME 0xFF00 +#define PID_COMPASS 0x22 +#define PID_MEMS_TEMP 0x23 +#define PID_BATTERY_VOLTAGE 0x24 typedef struct { uint32_t time; |