Skip to content

Commit 43db111

Browse files
committed
wip #90
1 parent 8d04cbb commit 43db111

File tree

3 files changed

+39
-11
lines changed

3 files changed

+39
-11
lines changed

src/common/coderbot.js

+3
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ class CoderBot {
182182
data.ctrlTurnSpeed = remoteConfig.ctrl_tr_speed;
183183
data.audioLevel = remoteConfig.audio_volume_level;
184184
data.adminPassword = remoteConfig.admin_password;
185+
data.hardwareVersion = remoteConfig.hardware_version;
185186
this.$store.commit('setSettings', data);
186187
}
187188

@@ -223,6 +224,8 @@ class CoderBot {
223224
ctrl_tr_speed: settings.ctrlTurnSpeed,
224225
audio_volume_level: settings.audioLevel,
225226
admin_password: settings.adminPassword,
227+
hardware_version: settings.hardwareVersion,
228+
226229
});
227230
this.$store.commit('setSettings', settings);
228231
return this.$axios.post(`${this.CBv1}/config`, legacySettings);

src/components/Settings.vue

+35-11
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,22 @@
348348
<v-layout row wrap>
349349
<!-- Column A -->
350350
<v-col xs12 md6 offset-md3>
351+
<v-card>
352+
<v-card-title>
353+
<h3 class="text-xs-left">{{ $t('message.settings_hardware_version') }}</h3>
354+
</v-card-title>
355+
<div class="cardContent">
356+
<v-select
357+
v-model="settings.hardwareVersion"
358+
:items="hardware_version_items"
359+
item-title="text"
360+
item-value="key"
361+
v-bind:label="$t('message.settings_hardware_version')"
362+
single-line
363+
/>
364+
</div>
365+
</v-card>
366+
<br>
351367
<v-card>
352368
<v-card-title>
353369
<h3 class="text-xs-left">{{ $t('message.settings_button_title') }}</h3>
@@ -715,7 +731,9 @@ export default {
715731
},
716732
name: 'Settings',
717733
setup() {
718-
return { v$: useVuelidate() };
734+
return {
735+
v$: useVuelidate(),
736+
};
719737
},
720738
mounted() {
721739
this.pollStatus();
@@ -892,7 +910,7 @@ export default {
892910
if (this.v$.$invalid) {
893911
this.snackText = this.$i18n.t('message.settings_errors');
894912
this.snackbar = true;
895-
console.log(this.$v);
913+
console.log(this.v$);
896914
} else {
897915
/* eslint-disable func-names, object-shorthand, prefer-arrow-callback */
898916
const needRestart = this.needRestart();
@@ -952,6 +970,7 @@ export default {
952970
cbName: true,
953971
btnFun: true,
954972
audioLevel: true,
973+
hardwareVersion: true,
955974
moveFwdElapse: false,
956975
moveFwdSpeed: false,
957976
moveTurnElapse: false,
@@ -1015,6 +1034,7 @@ export default {
10151034
wifiSSID: null,
10161035
wifiPsw: null,
10171036
1037+
hardwareVersion: null,
10181038
audioLevel: null,
10191039
moveFwdElapse: null,
10201040
moveFwdSpeed: null,
@@ -1040,6 +1060,12 @@ export default {
10401060
},
10411061
drawer: null,
10421062
tab: null,
1063+
cnnModels: [],
1064+
dirty: false,
1065+
confirm_exit_dialog: null,
1066+
router_next: null,
1067+
adminPassword: null,
1068+
adminPassword_dialog: true,
10431069
tabs: [
10441070
this.$i18n.t('message.settings_tabs_general'),
10451071
this.$i18n.t('message.settings_tabs_movement'),
@@ -1059,20 +1085,15 @@ export default {
10591085
{ text: 'Anti shake', key: 'antishake' },
10601086
{ text: 'Very long', key: 'verylong' }
10611087
],
1062-
cnnModels: [],
1063-
dirty: false,
1064-
confirm_exit_dialog: null,
1065-
router_next: null,
1066-
adminPassword: null,
1067-
adminPassword_dialog: true,
1088+
hardware_version_items: [
1089+
{ key: '4', text: '4.0 (legacy)' },
1090+
{ key: '5', text: '5.0 (latest)' }
1091+
]
10681092
};
10691093
},
10701094
validations() {
10711095
return {
10721096
settings: {
1073-
ctrl_hud_image: {
1074-
alpha
1075-
},
10761097
cv_image_factor: {
10771098
required: true
10781099
},
@@ -1118,6 +1139,9 @@ export default {
11181139
cnn_default_model: {
11191140
required
11201141
},
1142+
hardwareVersion: {
1143+
required,
1144+
},
11211145
wifiMode: {
11221146
required,
11231147
alpha

src/i18n/locales/it/messages.json

+1
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@
171171
"settings_update_upload": "Caricamento del file:",
172172
"settings_update_select_file": "Seleziona il pacchetto di aggiornamento",
173173
"settings_update_text_1": "CoderBot verrà riavviato per applicare l'aggiornamento.",
174+
"settings_hardware_version": "Versione scheda di controllo",
174175
"settings_movement_control": "Parametri modalità controllo",
175176
"settings_movement_program": "In modalità programmazione",
176177
"settings_movement_control_forward_speed": "Velocità spostamento",

0 commit comments

Comments
 (0)