diff --git a/src/pages/ota-wizard/ota-wizard.html b/src/pages/ota-wizard/ota-wizard.html index ae297fb..3560046 100644 --- a/src/pages/ota-wizard/ota-wizard.html +++ b/src/pages/ota-wizard/ota-wizard.html @@ -35,13 +35,37 @@ + + + + OTAWIZ.COMPILATION.COMPILING.TITLE + + + + + OTAWIZ.COMPILATION.GO_ONLINE.TITLE + OTAWIZ.COMPILATION.GO_ONLINE.TEXT + + + + OTAWIZ.COMPILATION.DONE.TITLE + + {{ 'OTAWIZ.BTN_NEXT' | translate }} + + + + + OTAWIZ.COMPILATION.ERROR.TITLE + + + - OTAWIZ.OTAMODE.TITLE - + OTAWIZ.OTAMODE.TITLE + @@ -50,7 +74,7 @@ Automatic mode - + {{ 'OTAWIZ.OTAMODESELECTION.AUTOMATIC' | translate}} @@ -61,7 +85,7 @@ Manual mode - + {{ 'OTAWIZ.OTAMODESELECTION.MANUAL' | translate}} @@ -71,7 +95,7 @@ - + @@ -85,13 +109,14 @@ - + {{ 'OTAWIZ.BTN_NEXT' | translate }} + @@ -103,7 +128,7 @@ - + {{ 'OTAWIZ.BTN_NEXT' | translate }} @@ -111,30 +136,6 @@ - - - - OTAWIZ.COMPILATION.COMPILING.TITLE - - - - - OTAWIZ.COMPILATION.GO_ONLINE.TITLE - OTAWIZ.COMPILATION.GO_ONLINE.TEXT - - - - OTAWIZ.COMPILATION.DONE.TITLE - - {{ 'OTAWIZ.BTN_NEXT' | translate }} - - - - - OTAWIZ.COMPILATION.ERROR.TITLE - - - diff --git a/src/pages/ota-wizard/ota-wizard.ts b/src/pages/ota-wizard/ota-wizard.ts index 1b3a232..013768e 100644 --- a/src/pages/ota-wizard/ota-wizard.ts +++ b/src/pages/ota-wizard/ota-wizard.ts @@ -160,13 +160,13 @@ export class OtaWizardPage implements OnInit, OnDestroy { // call logic for each slide onSlideChange() { this.slideHistory.push(OtaSlides[this.currentSlide]) + console.log("currentSlide",this.currentSlide); switch (this.currentSlide) { case OtaSlides.Intro: - case OtaSlides.Intro2: - if(this.modus == undefined) this.slides.lockSwipeToNext(true); break - case OtaSlides.Intro3: - break + case OtaSlides.ModeGuide: + //if(this.modus == undefined) this.slides.lockSwipeToNext(true); + break case OtaSlides.Compilation: this.handleCompilation() break @@ -224,6 +224,7 @@ export class OtaWizardPage implements OnInit, OnDestroy { } private handleCompilation() { + console.log("handleCompilation",this.compiledSketch); this.slides.lockSwipeToNext(!this.compiledSketch) // need to go online for compilation. compilation is retriggered via this.onlineSub @@ -311,9 +312,10 @@ type OtaState = { // names for the slide indices for easier access enum OtaSlides { Intro = 0, - Intro2 = 1, - Compilation = 2, - Intro3 = 3, + // Intro2 = 1, + Compilation = 1, + ModeGuide = 2, + Mode = 3, WifiSelection = 4, Upload = 5, }
OTAWIZ.COMPILATION.GO_ONLINE.TEXT