Skip to content

Commit

Permalink
Merge pull request #9 from mkoch227/new-telemetry-features
Browse files Browse the repository at this point in the history 
New telemetry features
  • Loading branch information
@mike-koch
mike-koch committed May 25, 2015
2 parents 3b9302e + d1451c4 commit 38a06eb
Show file tree
Hide file tree
Showing 20 changed files with 918 additions and 121 deletions.
13 changes: 8 additions & 5 deletions README.md
View file
Expand Up @@ -3,18 +3,21 @@ Euro Truck Simulator 2's Route Advisor, for mobile devices. This is a skin for f

## Features
The mobile Route Advisor is planned to include all features that Euro Truck Simulator 2's Route Advisor currently has. These features are:
- Mini-map
- Navigation
- The mini-map will be the most difficult to create, as the Telemtry SDK does not provide any graphical representation of the truck's current position in-game, except for X, Y, and Z coordinates. These coordinates, unfortunately, have no relationship to latitude / longitude coordinates, nor is the ETS 2 map 100% accurate with real roadways. An ETS2 map has been created by Funbit, who created the ETS2 Telemetry server; however there is no relationship to pixels vs in-game coordinates at this time.
- Speed limit
- Distance Remaining
- Estimated time of arrival (ETA)
- Time to destination
- Current job information
- Current load
- Origin city
- Destination city
- Payout
- Time remaining
- Time until next rest
- Truck damage / load damage
- Support for translations
- km/h or mph for speed
- 12-hour or 24-hour time format
- Localization support
- [Various configuration options](https://github.com/mkoch227/ets2-mobile-route-advisor/wiki/config.json-Parameters)

## Languages
Below are the supported languages. If you would like to submit a translation, you can do so by submitting a pull request.
Expand Down
2 changes: 1 addition & 1 deletion config.json
View file
Expand Up @@ -22,8 +22,8 @@

/* Skin-specific settings. See https://github.com/mkoch227/ets2-mobile-route-advisor/wiki for descriptions and possible values */
"language": "en-US.json",
"speedUnits": "kmh",
"timeFormat": "24h",
"distanceUnits": "km",
"weightUnits": "kg",
"currencyCode": "EUR",
}
Expand Down
4 changes: 4 additions & 0 deletions css/font-awesome.min.css
View file

Large diffs are not rendered by default.

46 changes: 16 additions & 30 deletions dashboard.css
View file
@@ -1,6 +1,7 @@
@import url(bootstrap.min.css);
@import url(css/fonts.css);
@import url(css/animation.css);
@import url(css/font-awesome.min.css);

body {
background-color: #000;
Expand All @@ -22,24 +23,6 @@ body {
width: 2048px;
height: 1152px;
}
.noJob {
display: none;
}

.hasJob[data-value="false"] > .noJob {
display: block;
}

.noJob > .row {
margin-top: 270px;
}
.yesJob {
visibility: hidden;
}

.hasJob.yes > .yesJob {
visibility: visible;
}
._header > ._row,
._footer > ._row {
color: #FFF;
Expand Down Expand Up @@ -89,6 +72,10 @@ body {
background-color: #888;
}

._yellow-color {
color: #FB9912;
}

._hasJobHeader p {
color: #FB9912;
padding-left: 40px;
Expand Down Expand Up @@ -122,6 +109,9 @@ a, a:hover, a:visited, a:active, a:focus {
._damageBarColor {
background-color: #930002;
}
._restBarColor {
background-color: #1e88e5;
}
.progress {
background-color: #888;
}
Expand All @@ -140,7 +130,7 @@ a, a:hover, a:visited, a:active, a:focus {
overflow: hidden;
}

.yesJob > .row:nth-child(odd) {
.alternateRowBackground .row:nth-child(odd) {
background-color: rgba(100,100,100,0.5);
}

Expand All @@ -164,18 +154,14 @@ a, a:hover, a:visited, a:active, a:focus {
max-width: 2048px;
z-index: 1;
}
.dashboard.connected .has-connection {
display: none;
}

.dashboard.connected .no-connection {
display: block;
}

.dashboard.connected.yes .has-connection {
display: block;
._speedHeaderText {
color: #000;
}

.dashboard.connected.yes .no-connection {
display: none;
._speedLimit {
background: transparent url(img/speed-limit-sign.png) no-repeat center center;
width: 100px;
height: 100px;
color: #000;
}
145 changes: 108 additions & 37 deletions dashboard.html
View file
@@ -1,95 +1,152 @@
<p style="display: none" class="lXHours"></p>
<p style="display: none" class="lXHour"></p>
<p style="display: none" class="lXMinutes"></p>
<p style="display: none" class="lXMinute"></p>
<div class="dashboard connected">
<div class="row no-connection _font-color-and-size">
<span class="lWaitingForConnection"></span><span>...</span>
</div>
<div class="has-connection">
<div class="row _headerRow">
<div class="col-xs-3 _headerItem text-center _headerEnd">
<span class="truckSpeedRoundedKmhMph"></span> <span id="speedUnits"></span>
<span class="truckSpeedRoundedKmhMph"></span> <span class="speedUnits"></span>
</div>
<div class="col-xs-1 _headerItem">
<span class="gear"></span>
</div>
<div class="col-xs-2 _headerItem">
<div class="col-xs-4 _headerItem">
<div class="row">
<div class="col-xs-3">
<div class="col-xs-2">
<i class="icon-fuel"></i>
</div>
<div class="col-xs-9" style="padding-left: 30px">
<div class="col-xs-2" style="margin-left: -25px">
<div class="progress" style="margin-top: 40px">
<div class="progress-bar _fuelBarColor" id="fuelLine"></div>
</div>
</div>
</div>
</div>
<div class="col-xs-2 _headerItem">
<div class="row">
<div class="col-xs-4">
<div class="col-xs-2" style="margin-left: -25px">
<i class="icon-truck"></i>
</div>
<div class="col-xs-8">
<div class="progress" style="margin-top: 40px">
<div class="col-xs-2">
<div class="progress" style="margin-top: 40px; margin-left: -15px">
<div class="progress-bar _damageBarColor" id="damageLine">
</div>
</div>
</div>
<div class="col-xs-2" style="margin-left: -10px">
<i class="fa fa-bed"></i>
</div>
<div class="col-xs-2">
<div class="progress" style="margin-left: -15px; margin-top: 40px">
<div class="progress-bar _restBarColor" id="restLine"></div>
</div>
</div>
</div>
</div>
<div class="col-xs-4 _headerItem text-center _headerEnd">
<span class="gameTime" id="headerTime"></span>
<span class="game-time" id="headerTime"></span>
</div>
</div>
<div class="_container">
<div class="_font-color-and-size">
<div id="map" style="display: none">
<div class="row _hasJobHeader">
<div class="col-xs-12">
<div class="col-xs-6">
<p class="lNavigation"></p>
</div>
<div class="col-xs-6 _cargoRightSide">
<span class="speedLimitRoundedKmhMph"></span> <span class="speedUnits"></span>
</div>
</div>
<div class="row" style="position: relative; max-height: 660px; max-width: 2048px; overflow: hidden;">
<div class="_overlay">
<p class="text-center lNavigationUnavailable"></p>
<div class="alternateRowBackground">
<div class="noJob">
<div class="row _cargoInfo">
<div class="col-xs-4">
<p class="lSpeedLimit"></p>
</div>
<div class="col-xs-8 _cargoRightSide">
<span class="speedLimitRoundedKmhMph"></span> <span class="speedUnits"></span>
</div>
</div>
</div>
<div class="_images">
<!-- The image sources below look completely wrong, however it is correct due to the way the server works -->
<img src="skins/mobile-route-advisor/img/map.png">
<img src="skins/mobile-route-advisor/img/nav-arrow.png" class="_navArrow" alt="GPS Navigation Arrow">
<div class="hasJob">
<div class="row _cargoInfo">
<div class="col-xs-4">
<p class="lSpeedLimit"></p>
</div>
<div class="col-xs-8 _cargoRightSide">
<span class="speedLimitRoundedKmhMph"></span> <span class="speedUnits"></span>
</div>
</div>
<div class="row _cargoInfo">
<div class="col-xs-4">
<p class="lDistanceRemaining"></p>
</div>
<div class="col-xs-8 _cargoRightSide">
<span class="navigationEstimatedDistanceKmMi"></span> <span class="distanceUnits"></span>
</div>
</div>
<div class="row _cargoInfo">
<div class="col-xs-4">
<p class="lETA"></p>
</div>
<div class="col-xs-8 _cargoRightSide">
<span class="navigation-estimatedTime"></span>
</div>
</div>
<div class="row _cargoInfo">
<div class="col-xs-4">
<p class="lTimeToDestination"></p>
</div>
<div class="col-xs-8 _cargoRightSide">
<span class="navigation-timeToDestination"></span>
</div>
</div>
</div>
</div>
</div>
<div id="cargo">
<div class="row _hasJobHeader">
<div class="col-xs-12">
<div class="col-xs-6">
<p class="lCurrentJob"></p>
</div>
<div class="col-xs-6 _cargoRightSide">
<span class="speedLimitRoundedKmhMph"></span> <span class="speedUnits"></span>
</div>
</div>
<div class="hasJob">
<div class="alternateRowBackground">
<div class="noJob">
<div class="row">
<div class="col-xs-12">&nbsp;</div>
</div>
<div class="row">
<div class="col-xs-12">&nbsp;</div>
</div>
<div class="row">
<div class="col-xs-8 col-xs-offset-2 text-center">
<p class="lNoJob"></p>
</div>
</div>
</div>
<div class="yesJob">
<div class="row">
<div class="col-xs-12">&nbsp;</div>
</div>
<div class="row _cargoInfo">
<div class="col-xs-4">
<p class="lCargoName"></p>
<p class="lNextRestStopIn"></p>
</div>
<div class="col-xs-8 _cargoRightSide">
<div class="trailer">
<span class="trailerName"></span> (<span class="trailerMassKgOrT"></span>)
</div>
<span class="game-nextRestStopTime _yellow-color"></span>
</div>
</div>
</div>
<div class="hasJob">
<div class="row _cargoInfo">
<div class="col-xs-4">
<p class="lSource"></p>
<p class="lCargoName"></p>
</div>
<div class="col-xs-8 _cargoRightSide">
<div class="source">
<span class="_jobSource"><span class="sourceCity"></span> - <span class="sourceCompany"></span></span>
<div class="trailer">
<span class="trailer-name"></span> (<span class="trailerMassKgOrT"></span>)
</div>
</div>
</div>
Expand All @@ -99,7 +156,7 @@
</div>
<div class="col-xs-8 _cargoRightSide">
<div class="destination">
<span class="_jobDestionation"><span class="destinationCity"></span> - <span class="destinationCompany"></span></span>
<span class="_jobDestionation"><span class="job-destinationCity"></span> - <span class="job-destinationCompany"></span></span>
</div>
</div>
</div>
Expand All @@ -108,7 +165,7 @@
<p class="lDeadline"></p>
</div>
<div class="col-xs-8 _cargoRightSide">
<div class="jobDeadlineTime"></div>
<div class="job-deadlineTime"></div>
</div>
</div>
<div class="row _cargoInfo">
Expand All @@ -125,17 +182,28 @@
<p class="lTimeRemaining"></p>
</div>
<div class="col-xs-8 _cargoRightSide">
<div class="jobRemainingTime"></div>
<div class="job-remainingTime"></div>
</div>
</div>
<div class="row _cargoInfo">
<div class="col-xs-4">
<p class="lNextRestStopIn"></p>
</div>
<div class="col-xs-8 _cargoRightSide">
<span class="game-nextRestStopTime _yellow-color"></span>
</div>
</div>
</div>
</div>
</div>
<div id="damage" style="display: none">
<div class="row _hasJobHeader">
<div class="col-xs-12">
<div class="col-xs-6">
<p class="lDamage"></p>
</div>
<div class="col-xs-6 _cargoRightSide">
<span class="speedLimitRoundedKmhMph"></span> <span class="speedUnits"></span>
</div>
</div>
<div class="row _cargoInfo _max400">
<div class="col-xs-4 col-xs-offset-1 text-center _filler">
Expand All @@ -158,13 +226,16 @@
</div>
<div id="about" style="display: none">
<div class="row _hasJobHeader">
<div class="col-xs-12">
<div class="col-xs-6">
<p class="lAbout"></p>
</div>
<div class="col-xs-6 _cargoRightSide">
<span class="speedLimitRoundedKmhMph"></span> <span class="speedUnits"></span>
</div>
</div>
<div class="row _cargoInfo">
<div class="col-xs-12 text-center">
<p>Mobile Route Advisor - v1.0.5</p>
<p>Mobile Route Advisor - v2.0.0</p>
</div>
</div>
<div class="row _cargoInfo">
Expand Down

0 comments on commit 38a06eb

Please sign in to comment.