Merge branch 'master' of https://github.com/williamchitto/traccar into williamchitto-master

Conflicts:
	pom.xml
	src/org/traccar/Server.java

1 files changed, 9 insertions, 3 deletions

diff --git a/setup/windows/windows.cfg b/setup/windows/windows.cfg
index 273b0700b..3487189f6 100644
--- a/setup/windows/windows.cfg
+++ b/setup/windows/windows.cfg
@@ -16,7 +16,7 @@
     <!-- Create database schema -->

     <entry key="database.initialize">

         CREATE TABLE IF NOT EXISTS devices (id INT IDENTITY, imei VARCHAR(16));

-        CREATE TABLE IF NOT EXISTS positions (device_id INT, time TIMESTAMP, valid BOOLEAN, latitude DOUBLE, longitude DOUBLE, speed DOUBLE, course DOUBLE, power DOUBLE);

+        CREATE TABLE IF NOT EXISTS positions (device_id INT, time TIMESTAMP, valid BOOLEAN, latitude DOUBLE, longitude DOUBLE, speed DOUBLE, course DOUBLE, power DOUBLE, mode INT);

     </entry>

 

     <!-->

@@ -72,11 +72,12 @@
         speed - Double

         course - Double

         power - Double (NULL for some protocols)

+        mode - Integer

         extended_info - String (XML)

     <-->

     <entry key="database.insertPosition">

         INSERT INTO positions (device_id, time, valid, latitude, longitude, speed, course, power)

-	VALUES (:device_id, :time, :valid, :latitude, :longitude, :speed, :course, :power)

+	VALUES (:device_id, :time, :valid, :latitude, :longitude, :speed, :course, :power, :mode)

     </entry>

 

     <!-- Web interface port -->

@@ -84,7 +85,7 @@
     <entry key="http.port">8082</entry>

 

     <!-- Logging options -->

-    <entry key="logger.enable">false</entry>

+    <entry key="logger.enable">true</entry>

     <entry key="logger.file">[LOG]</entry>

 

     <!-- Xexun server configuration -->

@@ -136,5 +137,10 @@
     <entry key="meiligao.enable">true</entry>

     <entry key="meiligao.port">5009</entry>

     <entry key="meiligao.resetDelay">0</entry>

+    

+    <!-- ST210 server configuration -->

+    <entry key="st210.enable">true</entry>

+    <entry key="st210.port">5010</entry>

+    <entry key="st210.resetDelay">0</entry>

 

 </properties>