diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 59038f3..be6e833 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -13,12 +13,14 @@ }, "OPENSOURCE": { "TITLE": "Open Source", - "TEXT": "This app is free & libre open source software. To may find the source code & issue tracker on GitHub:" + "TEXT": "This app is free & libre open source software. You may find the source code & issue tracker on GitHub:" }, "HINT": "Hint: A web version of Blockly for senseBox is available as well!" }, "BLOCKLY": { - "TITLE": "Blockly for senseBox" + "TITLE": "Blockly for senseBox", + "BTN_CODE": "Code View", + "BTN_OTA": "OTA Programmer" }, "OTAWIZ": { "TITLE": "Over The Air Programmer", @@ -27,19 +29,27 @@ "BTN_BACK": "Back", "INTRO": { "TITLE": "Welcome", - "TEXT": "To program your senseBox wirelessly, please follow these steps. We will help you connect to your senseBox via WiFi.", + "TEXT": "To transfer your code to your senseBox over the air (OTA), please follow these steps.", "STEPS": "First, please make sure that your senseBox...", - "STEP1": "has the WiFi shield plugged in", + "STEP1": "has the WiFi Bee plugged in XBee Slot 1", "STEP2": "has the initial OTA sketch installed", - "STEP3": "is running" + "STEP3": "is powered" + }, + "OTAMODE": { + "TITLE": "Enable OTA Mode", + "TEXT": "To transfer your code, the senseBox must be in OTA mode.
This is indicated by the green blinking LED next to the red reset button.", + "STEPS": "To enable OTA mode...", + "STEP1": "press & hold the switch button (gray or blue)", + "STEP2": "press the red reset button shortly", + "STEP3": "release the switch button after one second" }, "COMPILATION": { "COMPILING": { "TITLE": "Compiling your sketch..." }, "GO_ONLINE": { - "TITLE": "Compiling your sketch...", - "TEXT": "For compilation, you need to connect to the internet. Please enable a connection." + "TITLE": "You are offline.", + "TEXT": "For compilation you need to connect to the internet. Please enable a connection." }, "DONE": { "TITLE": "Sketch successfully compiled." @@ -51,11 +61,13 @@ "WIFI": { "MANUAL": { "TITLE": "Connect to your senseBox", - "TEXT": "Your senseBox should have opened the a WiFi network. Because we can not do this automatically on your platform, please connect to it manually." + "TEXT": "Your senseBox should have created a WiFi network. Because we can not do this automatically on your platform, please connect to it manually." }, "AUTO": { "TITLE": "Select your senseBox", - "TEXT": "In the list, all running senseBoxes with OTA available are shown. If you don't see yours, please make sure that GPS is enabled.", + "TEXT1": "All powered senseBoxes around you with OTA mode enabled are listed here.", + "TEXT2": "Please check the last digits of MAC-Adress on your WiFi Bee to identify your senseBox. You can find it printed on the bottom of the WiFi Bee.", + "TEXT3": "If you can't find your senseBox, please make sure that your WiFi Bee is mounted correctly, OTA mode is enabled and GPS is enabled on this device.", "AVAILABLE": "Available senseBox WiFis", "SCANNING": "searching...", "CONNECTING": "connecting...", diff --git a/src/pages/blockly/blockly.html b/src/pages/blockly/blockly.html index a223151..1fcba56 100644 --- a/src/pages/blockly/blockly.html +++ b/src/pages/blockly/blockly.html @@ -14,12 +14,28 @@ - - + + - - + + diff --git a/src/pages/ota-wizard/ota-wizard.html b/src/pages/ota-wizard/ota-wizard.html index 8f01638..0720c0e 100644 --- a/src/pages/ota-wizard/ota-wizard.html +++ b/src/pages/ota-wizard/ota-wizard.html @@ -7,13 +7,13 @@ - + - +

OTAWIZ.INTRO.TITLE

@@ -36,11 +36,38 @@ - + + + + +

OTAWIZ.OTAMODE.TITLE

+

+

OTAWIZ.OTAMODE.STEPS

+
    +
  1. +
  2. +
  3. +
+ + + + + + + + + + + +

OTAWIZ.COMPILATION.COMPILING.TITLE

- + + @@ -78,7 +105,11 @@

OTAWIZ.WIFI.AUTO.TITLE

-

OTAWIZ.WIFI.AUTO.TEXT

+
    +
  • OTAWIZ.WIFI.AUTO.TEXT1
    • +
  • OTAWIZ.WIFI.AUTO.TEXT2
    • +
  • OTAWIZ.WIFI.AUTO.TEXT3
    • +
@@ -89,12 +120,12 @@ - + {{ 'OTAWIZ.WIFI.AUTO.SCANNING' | translate }} - + {{ 'OTAWIZ.WIFI.AUTO.CONNECTING' | translate }} @@ -122,7 +153,7 @@

OTAWIZ.UPLOAD.UPLOADING

- + diff --git a/src/pages/ota-wizard/ota-wizard.scss b/src/pages/ota-wizard/ota-wizard.scss index 81c3006..3dbdd0b 100644 --- a/src/pages/ota-wizard/ota-wizard.scss +++ b/src/pages/ota-wizard/ota-wizard.scss @@ -20,10 +20,10 @@ page-ota-wizard { } } - p, ul { + p, ul, ol { padding: 0 20px; font-size: 16px; - line-height: 1.4; + line-height: 1.5; color: #60646B; b { @@ -32,8 +32,13 @@ page-ota-wizard { } } + ul, ol { + margin-left: 4%; + li { + padding-bottom: 8px; + } + } ul { - margin-left: 3%; list-style-type: disc; } } @@ -54,7 +59,5 @@ page-ota-wizard { overflow-y: scroll; } } - - } } diff --git a/src/pages/ota-wizard/ota-wizard.ts b/src/pages/ota-wizard/ota-wizard.ts index 7fc468e..2a6737c 100644 --- a/src/pages/ota-wizard/ota-wizard.ts +++ b/src/pages/ota-wizard/ota-wizard.ts @@ -3,6 +3,7 @@ import { OnDestroy, OnInit, ViewChild, + ChangeDetectorRef, } from '@angular/core' import { IonicPage, @@ -23,14 +24,8 @@ import { CompilerProvider } from '../../providers/compiler/compiler'; }) export class OtaWizardPage implements OnInit, OnDestroy { @ViewChild(Slides) slides: Slides - onlineSub: Subscription - offlineSub: Subscription - - sketch = '' availableSenseboxes: string[] = [] // list of SSIDs - compiledSketch: ArrayBuffer = undefined errorMsg = '' - state: OtaState = { isOnline: false, compilation: 'compiling', @@ -38,12 +33,24 @@ export class OtaWizardPage implements OnInit, OnDestroy { upload: 'uploading', } + // for unified slide index access in the template + slideCompilation = OtaSlides.Compilation + slideWifi = OtaSlides.WifiSelection + slideUpload = OtaSlides.Upload + + private onlineSub: Subscription + private offlineSub: Subscription + private sketch = '' + private compiledSketch: ArrayBuffer = undefined + private hiddenSlides: OtaSlides[] = [] + constructor( private network: Network, private otaWifi: OtaWifiProvider, - private navCtrl : NavController, + private navCtrl: NavController, + private webcompiler: CompilerProvider, + private changedetect: ChangeDetectorRef, navParams : NavParams, - private compilerprovider:CompilerProvider ) { // for OTA to work, the new sketch has to include the OTA logic as well. // to ensure that, we're prepending it here to the sketch. @@ -61,6 +68,14 @@ export class OtaWizardPage implements OnInit, OnDestroy { ngOnInit() { // try to start compilation already in the background this.compileSketch() + .then(() => this.hideSlide(OtaSlides.Compilation)) + + if (this.otaWifi.strategy === WifiStrategy.Automatic) { + this.otaWifi.findSenseboxes(true) + .then(ssids => this.availableSenseboxes = ssids) + } else { + this.state.wifiSelection = 'manual' + } this.state.isOnline = this.network.type !== 'none' @@ -81,7 +96,7 @@ export class OtaWizardPage implements OnInit, OnDestroy { } onWifiRefresh () { - this.handleWifiSelection() + this.handleWifiSelection(true) } onClose () { @@ -90,8 +105,9 @@ export class OtaWizardPage implements OnInit, OnDestroy { // call logic for each slide onSlideChange () { - switch (this.slides.getActiveIndex()) { + switch (this.currentSlide) { case OtaSlides.Intro: + case OtaSlides.Intro2: this.slides.lockSwipeToNext(false) break @@ -112,6 +128,23 @@ export class OtaWizardPage implements OnInit, OnDestroy { } } + get currentSlide (): OtaSlides { + const current = this.slides.getActiveIndex() + const hiddenOffset = this.hiddenSlides.filter(slide => slide <= current).length + return current + hiddenOffset + } + + slideIsHidden (slide: OtaSlides): boolean { + return this.hiddenSlides.indexOf(slide) !== -1 + } + + private hideSlide (slide: OtaSlides) { + if (this.currentSlide === slide) return + if (this.slideIsHidden(slide)) return + this.hiddenSlides.push(slide) + this.slides.update() + } + async connectToSensebox (ssid: string) { this.state.wifiSelection = 'connecting' try { @@ -126,10 +159,7 @@ export class OtaWizardPage implements OnInit, OnDestroy { } private handleCompilation () { - // skip compilation slide if already compiled this.slides.lockSwipeToNext(!this.compiledSketch) - if (this.compiledSketch) - return this.slides.slideNext(0) // need to go online for compilation. compilation is retriggered via this.onlineSub if (!this.state.isOnline) { @@ -145,20 +175,25 @@ export class OtaWizardPage implements OnInit, OnDestroy { } } - private async handleWifiSelection () { - this.slides.lockSwipeToNext(true) + private async handleWifiSelection (force = false) { + if (this.otaWifi.strategy === WifiStrategy.Automatic) { + this.slides.lockSwipeToNext(true) + + // skip scan when boxes where already found from the scan on startup + if (!force && this.availableSenseboxes.length) + return this.state.wifiSelection = 'select' - if (this.otaWifi.strategy == WifiStrategy.Manual) { - this.state.wifiSelection = 'manual' - this.slides.lockSwipeToNext(false) - } else { - this.state.wifiSelection = 'scanning' try { + this.state.wifiSelection = 'scanning' + // force update of view, as setting subproperties of this.state is not detected automatically :/ + this.changedetect.detectChanges() this.availableSenseboxes = await this.otaWifi.findSenseboxes(true) this.state.wifiSelection = 'select' + this.changedetect.detectChanges() } catch (err) { - this.state.wifiSelection = 'error' this.errorMsg = err.message + this.state.wifiSelection = 'error' + this.changedetect.detectChanges() } } } @@ -181,7 +216,7 @@ export class OtaWizardPage implements OnInit, OnDestroy { private async compileSketch () { this.state.compilation = 'compiling' try { - this.compiledSketch = await this.compilerprovider.callcompiler(this.sketch) + this.compiledSketch = await this.webcompiler.compile(this.sketch) this.state.compilation = 'done' this.slides.lockSwipeToNext(false) } catch (err) { @@ -206,7 +241,8 @@ type OtaState = { // names for the slide indices for easier access enum OtaSlides { Intro = 0, - Compilation = 1, - WifiSelection = 2, - Upload = 3, + Intro2 = 1, + Compilation = 2, + WifiSelection = 3, + Upload = 4, }