CreatBot/CreatBotMainsail
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: fix output of klippy state, if UDS path/address dont fit (#1263)

Browse Source 
Co-authored-by: th33xitus <domwil1091+github@gmail.com>
This commit is contained in:
Stefan Dej 2023-02-11 12:11:52 +01:00 committed by GitHub
parent 3b5d7f146b
commit a8bf9e9559
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/mixins/base.ts
View File

@ -34,6 +34,8 @@ export default class BaseMixin extends Vue {
} }
get klipperState(): string { get klipperState(): string {
if (!this.klippyIsConnected) return 'disconnected'
return this.$store.state.server.klippy_state ?? '' return this.$store.state.server.klippy_state ?? ''
} }

2
src/components/panels/KlippyStatePanel.vue
View File

@ -97,7 +97,7 @@
</p> </p>
<connection-status :moonraker="true" :klipper="false"></connection-status> <connection-status :moonraker="true" :klipper="false"></connection-status>
<p class="mt-2 mb-0 text-center">{{ $t('Panels.KlippyStatePanel.MoonrakerCannotConnect') }}</p> <p class="mt-2 mb-0 text-center">{{ $t('Panels.KlippyStatePanel.MoonrakerCannotConnect') }}</p>
<p class="mb-0 text-center">{{ $t('Panels.KlippyStatePanel.KlipperCheck') }}</p> <p class="mb-0 text-center">{{ $t('Panels.KlippyStatePanel.CheckKlippyAndUdsAddress') }}</p>
</v-alert> </v-alert>
</template> </template>
</div> </div>

2
src/locales/de.json
View File

@ -507,8 +507,8 @@
"WebcamOff": "Aus" "WebcamOff": "Aus"
}, },
"KlippyStatePanel": { "KlippyStatePanel": {
"CheckKlippyAndUdsAddress": "Bitte überprüfen, ob der Klipper-Dienst läuft und klippy_uds_address in der moonraker.conf korrekt konfiguriert ist.",
"FirmwareRestart": "Firmware Neustart", "FirmwareRestart": "Firmware Neustart",
"KlipperCheck": "Bitte überprüfen Sie, ob der Klipper-Dienst läuft und ein UDS (Unix Domain Socket) konfiguriert ist.",
"MoonrakerCannotConnect": "Moonraker kann keine Verbindung zu Klipper herstellen!", "MoonrakerCannotConnect": "Moonraker kann keine Verbindung zu Klipper herstellen!",
"PowerOn": "Drucker einschalten", "PowerOn": "Drucker einschalten",
"PrinterSwitchedOff": "Drucker ist ausgeschaltet", "PrinterSwitchedOff": "Drucker ist ausgeschaltet",

2
src/locales/en.json
View File

@ -517,8 +517,8 @@
"WebcamOff": "Off" "WebcamOff": "Off"
}, },
"KlippyStatePanel": { "KlippyStatePanel": {
"CheckKlippyAndUdsAddress": "Please check if the Klipper service is running and klippy_uds_address is correctly configured in the moonraker.conf.",
"FirmwareRestart": "Firmware Restart", "FirmwareRestart": "Firmware Restart",
"KlipperCheck": "Please check if the Klipper service is running.",
"MoonrakerCannotConnect": "Moonraker can't connect to Klipper!", "MoonrakerCannotConnect": "Moonraker can't connect to Klipper!",
"PowerOn": "Power on", "PowerOn": "Power on",
"PrinterSwitchedOff": "Printer is powered off", "PrinterSwitchedOff": "Printer is powered off",