Skip to content

Commit

Permalink
✨ [feat/scania-next-gen] add scania next gen symbols
Browse files Browse the repository at this point in the history 
Signed-off-by: JAGFx <[email protected]>
  • Loading branch information
@JAGFx
JAGFx committed Apr 9, 2022
1 parent ad6d7e6 commit 84114ab
Show file tree
Hide file tree
Showing 8 changed files with 262 additions and 3 deletions.
2 changes: 1 addition & 1 deletion lib/config/config.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"general_refresh_rate" : 100,
"general_skin_on_load" : "JAGFx",
"general_skin_on_load" : "ScaniaNextGen",
"general_h-shift-layout" : "h-shifter",
"general_skin_locale" : "en-EN",
"general_job_remaining" : "due_date",
Expand Down
3 changes: 2 additions & 1 deletion lib/sdk/scs_sdk_plugin_parsed_data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,8 @@
},
"odometer" : 108482.9609375,
"electric" : {
"enabled" : true
"enabled" : true,
"start":true
},
"wipers" : {
"enabled" : false
Expand Down
2 changes: 2 additions & 0 deletions src/assets/scss/dashboard/_scania-next-gen.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
@import "scania-next-gen/ad-blue-bar";
@import "scania-next-gen/fuel-gauge";
@import "scania-next-gen/water-temperature-gauge";
@import "scania-next-gen/symbols";
position: relative;

&.wrapper {

Expand Down
97 changes: 97 additions & 0 deletions src/assets/scss/dashboard/scania-next-gen/_symbols.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
/**
* @author: Emmanuel SMITH <[email protected]>
* project: ets2-dashboard-skin
* file: _symbols.scss
* Date: 08/04/2022
* Time: 08:42
*/

@import "variable";

.bodywork {
position: absolute;
left: 28rem;
top: 42.9rem;
display: flex;
width: 29.3rem;
justify-content: space-between;
}

.indicator {
position: absolute;
//width: 39.3rem;
top: 13.4rem;

&.symbols > .symbol {
font-size: 3rem;
background: transparent;
}

&.left {
left: 20rem;
}
&.right {
left: 62.2rem;
}
}

.general-warning {
position: absolute;
width: 39.3rem;
top: 13.4rem;
left: 23.8rem;

.symbols {
justify-content: flex-start;
}
.symbols > .symbol {
width: 3.13rem;
font-size: 2.6rem;
background: transparent;

.icon-scania-driver-safty-belt_red {
font-size: 2rem;
}
}
}

.indicator-symbols.symbols {
display: block;

.symbol {
position: absolute;
font-size: 2.6rem;

&.c2 { left: 5.6rem; bottom: 13.3rem; }
&.c3 { left: 9.2rem; top: 42.9rem; }
&.c12 { right: 9.2rem; top: 42.9rem; }
&.c13 { right: 5.6rem; bottom: 13.3rem; }
&.c14 { right: 2.3rem; bottom: 14.7rem; }
}
}

.symbols {
display: flex;
justify-content: center;
align-items: center;

.symbol {
width: 3.2rem;
height: 2.5rem;
background: #434343;
margin-right: .35rem;
display: flex;
justify-content: center;
align-items: center;
font-size: 2rem;

&.red { color: $cRed; }
&.yellow { color: $cYellow; }
&.green { color: $cGreen; }
&.blue { color: $cBlue; }

&:last-child{
margin-right: 0;
}
}
}
14 changes: 13 additions & 1 deletion src/components/dashboards/scania-next-gen/ScaniaNextGenDashboard.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@
mode="bar"
/>
</div>

<!-- <editor-folder> Symbols -->
<ScaniaNextGenGeneralWarningSymbols />
<ScaniaNextGenBodyworkSymbols />
<ScaniaNextGenIndicatorSymbols />
<!-- </editor-folder> Symbols -->
</Dashboard>
</template>

Expand All @@ -65,6 +71,9 @@ import Dashboard from '@/components/dashboards/Dashboard';
import ScaniaNextGenGaugeDisplay from '@/components/dashboards/scania-next-gen/gauges/ScaniaNextGenGaugeLeftDisplay';
import ScaniaNextGenGauges from '@/components/dashboards/scania-next-gen/gauges/ScaniaNextGenGauges';
import ScaniaNextGenAdBlueBar from '@/components/dashboards/scania-next-gen/ScaniaNextGenAdBlueBar';
import ScaniaNextGenBodyworkSymbols from '@/components/dashboards/scania-next-gen/symbols/ScaniaNextGenBodyworkSymbols';
import ScaniaNextGenGeneralWarningSymbols from '@/components/dashboards/scania-next-gen/symbols/ScaniaNextGenGeneralWarningSymbols';
import ScaniaNextGenIndicatorSymbols from '@/components/dashboards/scania-next-gen/symbols/ScaniaNextGenIndicatorSymbols';
import Bars from '@/components/dashboards/shared/Bars';
import TelemetryMixin from '@/mixins/TelemetryMixin';
Expand All @@ -75,7 +84,10 @@ export default {
ScaniaNextGenGauges,
ScaniaNextGenGaugeDisplay,
ScaniaNextGenAdBlueBar,
Bars
Bars,
ScaniaNextGenBodyworkSymbols,
ScaniaNextGenGeneralWarningSymbols,
ScaniaNextGenIndicatorSymbols
},
mixins: [TelemetryMixin]
};
Expand Down
30 changes: 30 additions & 0 deletions src/components/dashboards/scania-next-gen/symbols/ScaniaNextGenBodyworkSymbols.vue
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<template>
<div class="bodywork">
<div class="symbols">
<div class="symbol"></div>
<div class="symbol"></div>
<div class="symbol blue">
<i
v-if="telemetry2.symbols.beaconIsEnabled"
class="icon-scania-rotating-beacon_blue"
/>
</div>
<div class="symbol"></div>
</div>
<div class="symbols ml-2">
<div class="symbol"></div>
<div class="symbol"></div>
<div class="symbol"></div>
<div class="symbol"></div>
</div>
</div>
</template>

<script>
import TelemetryMixin from '@/mixins/TelemetryMixin';
export default {
name: 'ScaniaNextGenBodyworkSymbols',
mixins: [TelemetryMixin]
};
</script>
74 changes: 74 additions & 0 deletions src/components/dashboards/scania-next-gen/symbols/ScaniaNextGenGeneralWarningSymbols.vue
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
<template>
<div>
<div class="symbols indicator left">
<div class="symbol green">
<i
v-if="telemetry2.symbols.leftDirectionIsActive"
class="icon-scania-direction-indicator-left_green"
/>
</div>
</div>
<div class="general-warning">
<div class="symbols">
<div class="symbol"></div>
<div class="symbol"></div>
<div class="symbol"></div>
<div class="symbol red">
<i
v-if="telemetry2.symbols.brakePressureIsActive"
class="icon-scania-break-pressure_red_yellow"
/>
</div>
<div class="symbol red">
<i
v-if="telemetry2.truck.hasErrors"
class="icon-scania-warning_red"
/>
</div>
<div class="symbol blue">
<i
v-if="telemetry2.symbols.mainBeamIsEnabled"
class="icon-scania-main-beam_blue"
/>
</div>
<div class="symbol yellow">
<i
v-if="telemetry2.truck.hasWarnings"
class="icon-scania-warning_yellow"
/>
</div>
<div class="symbol red">
<i
v-if="telemetry2.symbols.parkingBrakeIsEnabled"
class="icon-scania-parking-break_red"
/>
</div>
<div class="symbol"></div>
<div class="symbol red">
<i
v-if="telemetry2.truck.ignitionStart"
class="icon-scania-driver-safty-belt_red"
/>
</div>
<div class="symbol"></div>
</div>
</div>
<div class="symbols indicator right">
<div class="symbol green">
<i
v-if="telemetry2.symbols.rightDirectionIsActive"
class="icon-scania-direction-indicator-right_green"
/>
</div>
</div>
</div>
</template>

<script>
import TelemetryMixin from '@/mixins/TelemetryMixin';
export default {
name: 'ScaniaNextGenGeneralWarningSymbols',
mixins: [TelemetryMixin]
};
</script>
43 changes: 43 additions & 0 deletions src/components/dashboards/scania-next-gen/symbols/ScaniaNextGenIndicatorSymbols.vue
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<template>
<div class="indicator-symbols symbols">
<div class="symbol c2 yellow">
<i
v-if="telemetry2.symbols.trailerLiftAxleIsEnabled"
class="icon-scania-trailer-tag-axle-raised_yellow"
/>
</div>
<div class="symbol c3 yellow">
<i
v-if="telemetry2.symbols.truckLiftAxleIsEnabled"
class="icon-scania-tractor-tag-axle-raised_yellow"
/>
</div>
<div class="symbol c12 yellow">
<i
v-if="telemetry2.symbols.differentialIsLocked"
class="icon-scania-differential-lock_yellow"
/>
</div>
<div class="symbol c13 green">
<i
v-if="telemetry2.symbols.retarderIsActive"
class="icon-scania-retarder_green"
/>
</div>
<div class="symbol c14 yellow">
<i
v-if="telemetry2.truck.hasEngineWarning"
class="icon-scania-engine-failure_yellow"
/>
</div>
</div>
</template>

<script>
import TelemetryMixin from '@/mixins/TelemetryMixin';
export default {
name: 'ScaniaNextGenIndicatorSymbols',
mixins: [TelemetryMixin]
};
</script>

1 comment on commit 84114ab

@JAGFx
Copy link
Owner Author

@JAGFx JAGFx commented on 84114ab Apr 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#78

Please sign in to comment.