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,82 +35,6 @@ - - - - - -

OTAWIZ.OTAMODE.TITLE

-
-
- - - - - Automatic mode - - -
- {{ 'OTAWIZ.OTAMODESELECTION.AUTOMATIC' | translate}} -
-
-
- - - - Manual mode - - -
- {{ 'OTAWIZ.OTAMODESELECTION.MANUAL' | translate}} -
-
-
- -
-
-
- - - - - - -

-
- -
    -
  1. -
  2. -
  3. -
- - -
-
-
- - - -
    -
  1. -
  2. -
  3. -
-
- - - - -
-
-
@@ -135,6 +59,83 @@

+ + + + + +

OTAWIZ.OTAMODE.TITLE

+
+
+ + + + + Automatic mode + + +
+ {{ 'OTAWIZ.OTAMODESELECTION.AUTOMATIC' | translate}} +
+
+
+ + + + Manual mode + + +
+ {{ 'OTAWIZ.OTAMODESELECTION.MANUAL' | translate}} +
+
+
+ +
+
+
+ + + + + + +

+
+ +
    +
  1. +
  2. +
  3. +
+ + +
+
+
+ + + + +
    +
  1. +
  2. +
  3. +
+
+ + + + +
+
+
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, }