diff --git a/interface/package.json b/interface/package.json index 38bef288e..019c20056 100644 --- a/interface/package.json +++ b/interface/package.json @@ -1,6 +1,6 @@ { "name": "EMS-ESP", - "version": "3.8.2", + "version": "3.9.0", "description": "EMS-ESP WebUI", "homepage": "https://emsesp.org", "author": "emsesp.org", diff --git a/mock-api/package.json b/mock-api/package.json index b294dba5a..fec2473af 100644 --- a/mock-api/package.json +++ b/mock-api/package.json @@ -1,6 +1,6 @@ { "name": "mock-api", - "version": "3.8.2", + "version": "3.9.0", "description": "mock api for EMS-ESP", "author": "proddy, emsesp.org", "license": "MIT", diff --git a/mock-api/restServer.ts b/mock-api/restServer.ts index 22e2c72b3..f062fb3ff 100644 --- a/mock-api/restServer.ts +++ b/mock-api/restServer.ts @@ -301,10 +301,10 @@ function updateMask(entity: any, de: any, dd: any) { const old_custom_name = dd.nodes[dd_objIndex].cn; console.log( 'comparing names, old (' + - old_custom_name + - ') with new (' + - new_custom_name + - ')' + old_custom_name + + ') with new (' + + new_custom_name + + ')' ); if (old_custom_name !== new_custom_name) { changed = true; @@ -402,15 +402,17 @@ function upgradeImportantMessages(version: string) { // see if its a filename with a .bin extension if (version.endsWith('.bin')) { - upgradeImportantMessageType_n = 1; // 1 means 3.9 and factory reset required + upgradeImportantMessageType_n = 1; // make it 1, for testing, meaning factory reset required } else if (version.endsWith('.md')) { - upgradeImportantMessageType_n = 0; + upgradeImportantMessageType_n = 0; // use default 0, no message } else { // this is a version string like "3.9.0" - upgradeImportantMessageType_n = 2; + // upgradeImportantMessageType_n = 2; // make it 2, for testing, meaning a major version upgrade + upgradeImportantMessageType_n = 1; // make it 1, for testing, meaning a factory reset is required + } - console.log('upgradeImportantMessageType: ' + upgradeImportantMessageType_n); + console.log('upgradeImportantMessageType: version=' + version + ' type=' + upgradeImportantMessageType_n); return { upgradeImportantMessageType: upgradeImportantMessageType_n }; } @@ -456,17 +458,17 @@ function get_versions() { console.log( 'getVersions: current=' + - THIS_VERSION + - ' stable=' + - LATEST_STABLE_VERSION + - ' (upgradeable=' + - (STABLE_VERSION_IS_UPGRADEABLE ? 'YES' : 'NO') + - ') dev=' + - LATEST_DEV_VERSION + - ' (upgradeable=' + - (DEV_VERSION_IS_UPGRADEABLE ? 'YES' : 'NO') + - ')' + - (MOCK_OFFLINE ? ' [offline]' : '') + THIS_VERSION + + ' stable=' + + LATEST_STABLE_VERSION + + ' (upgradeable=' + + (STABLE_VERSION_IS_UPGRADEABLE ? 'YES' : 'NO') + + ') dev=' + + LATEST_DEV_VERSION + + ' (upgradeable=' + + (DEV_VERSION_IS_UPGRADEABLE ? 'YES' : 'NO') + + ')' + + (MOCK_OFFLINE ? ' [offline]' : '') ); return data; } diff --git a/sonar-project.properties b/sonar-project.properties index 563719c80..d1d03a7d6 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,7 +1,7 @@ sonar.organization=emsesp sonar.projectKey=emsesp_EMS-ESP32 sonar.projectName=EMS-ESP32 -sonar.projectVersion=3.8.2 +sonar.projectVersion=3.9.0 sonar.sources=./src sonar.cfamily.compile-commands=bw-output/compile_commands.json sonar.sourceEncoding=UTF-8