diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index 0994bf5..103a4de 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -116,6 +116,7 @@ jobs: mkdir -p resources/ mkdir -p src/ cp -vf release/*/nuki_hub_*.bin ota/beta/ + cp -vf release/*/nuki_hub_*.elf ota/beta/ cp -vf master/resources/ota_manifest.py resources/ota_manifest.py cp -vf master/src/Config.h src/Config.h python3 resources/ota_manifest.py beta $Version diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 7559b85..9713a6b 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -139,6 +139,7 @@ jobs: mkdir -p resources/ mkdir -p src/ cp -vf release/*/nuki_hub_*.bin ota/master/ + cp -vf release/*/nuki_hub_*.elf ota/master/ cp -vf master/resources/ota_manifest.py resources/ota_manifest.py cp -vf master/src/Config.h src/Config.h python3 resources/ota_manifest.py master $Version diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 81146b6..0113275 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -129,7 +129,7 @@ jobs: cd ../.. done - + # remove last character ARTIFACTS="${ARTIFACTS%?}" echo "artifacts=${ARTIFACTS}" | tee -a ${GITHUB_OUTPUT} @@ -156,13 +156,15 @@ jobs: mkdir -p ota/master/ mkdir -p resources/ mkdir -p src/ - cp -vf release/*/nuki_hub_*.bin ota/ + cp -vf release/*/nuki_hub_*.bin ota/ + cp -vf release/*/nuki_hub_*.elf ota/ cp -vf master/resources/ota_manifest.py resources/ota_manifest.py cp -vf master/src/Config.h src/Config.h python3 resources/ota_manifest.py release $Version python3 resources/ota_manifest.py beta none find * -not -path "ota*" -delete rm -rf ota/beta/*.bin + rm -rf ota/beta/*.elf rm -rf .github .gitignore .gitmodules touch ota/beta/empty touch ota/master/empty @@ -189,7 +191,7 @@ jobs: ref: master - name: Set new version run: | - python3 resources/next_version.py + python3 resources/next_version.py - name: Commit config to master uses: stefanzweifel/git-auto-commit-action@v5 with: diff --git a/stacktrace/esp_exception_decoder_rs.js b/stacktrace/esp_exception_decoder_rs.js new file mode 100644 index 0000000..ff3fe8d --- /dev/null +++ b/stacktrace/esp_exception_decoder_rs.js @@ -0,0 +1,302 @@ + +let wasm; + +const heap = new Array(32).fill(undefined); + +heap.push(undefined, null, true, false); + +function getObject(idx) { return heap[idx]; } + +let heap_next = heap.length; + +function dropObject(idx) { + if (idx < 36) return; + heap[idx] = heap_next; + heap_next = idx; +} + +function takeObject(idx) { + const ret = getObject(idx); + dropObject(idx); + return ret; +} + +let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }); + +cachedTextDecoder.decode(); + +let cachegetUint8Memory0 = null; +function getUint8Memory0() { + if (cachegetUint8Memory0 === null || cachegetUint8Memory0.buffer !== wasm.memory.buffer) { + cachegetUint8Memory0 = new Uint8Array(wasm.memory.buffer); + } + return cachegetUint8Memory0; +} + +function getStringFromWasm0(ptr, len) { + return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len)); +} + +let cachegetInt32Memory0 = null; +function getInt32Memory0() { + if (cachegetInt32Memory0 === null || cachegetInt32Memory0.buffer !== wasm.memory.buffer) { + cachegetInt32Memory0 = new Int32Array(wasm.memory.buffer); + } + return cachegetInt32Memory0; +} + +const u32CvtShim = new Uint32Array(2); + +const uint64CvtShim = new BigUint64Array(u32CvtShim.buffer); + +function addHeapObject(obj) { + if (heap_next === heap.length) heap.push(heap.length + 1); + const idx = heap_next; + heap_next = heap[idx]; + + heap[idx] = obj; + return idx; +} + +let WASM_VECTOR_LEN = 0; + +let cachedTextEncoder = new TextEncoder('utf-8'); + +const encodeString = (typeof cachedTextEncoder.encodeInto === 'function' + ? function (arg, view) { + return cachedTextEncoder.encodeInto(arg, view); +} + : function (arg, view) { + const buf = cachedTextEncoder.encode(arg); + view.set(buf); + return { + read: arg.length, + written: buf.length + }; +}); + +function passStringToWasm0(arg, malloc, realloc) { + + if (realloc === undefined) { + const buf = cachedTextEncoder.encode(arg); + const ptr = malloc(buf.length); + getUint8Memory0().subarray(ptr, ptr + buf.length).set(buf); + WASM_VECTOR_LEN = buf.length; + return ptr; + } + + let len = arg.length; + let ptr = malloc(len); + + const mem = getUint8Memory0(); + + let offset = 0; + + for (; offset < len; offset++) { + const code = arg.charCodeAt(offset); + if (code > 0x7F) break; + mem[ptr + offset] = code; + } + + if (offset !== len) { + if (offset !== 0) { + arg = arg.slice(offset); + } + ptr = realloc(ptr, len, len = offset + arg.length * 3); + const view = getUint8Memory0().subarray(ptr + offset, ptr + len); + const ret = encodeString(arg, view); + + offset += ret.written; + } + + WASM_VECTOR_LEN = offset; + return ptr; +} + +function passArray8ToWasm0(arg, malloc) { + const ptr = malloc(arg.length * 1); + getUint8Memory0().set(arg, ptr / 1); + WASM_VECTOR_LEN = arg.length; + return ptr; +} +/** +* @param {Uint8Array} bin +* @param {string} dump +* @returns {Array} +*/ +export function decode(bin, dump) { + var ptr0 = passArray8ToWasm0(bin, wasm.__wbindgen_malloc); + var len0 = WASM_VECTOR_LEN; + var ptr1 = passStringToWasm0(dump, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + var len1 = WASM_VECTOR_LEN; + var ret = wasm.decode(ptr0, len0, ptr1, len1); + return takeObject(ret); +} + +/** +*/ +export class DecodedAddress { + + static __wrap(ptr) { + const obj = Object.create(DecodedAddress.prototype); + obj.ptr = ptr; + + return obj; + } + + __destroy_into_raw() { + const ptr = this.ptr; + this.ptr = 0; + + return ptr; + } + + free() { + const ptr = this.__destroy_into_raw(); + wasm.__wbg_decodedaddress_free(ptr); + } + /** + */ + get address() { + try { + const retptr = wasm.__wbindgen_add_to_stack_pointer(-16); + wasm.__wbg_get_decodedaddress_address(retptr, this.ptr); + var r0 = getInt32Memory0()[retptr / 4 + 0]; + var r1 = getInt32Memory0()[retptr / 4 + 1]; + u32CvtShim[0] = r0; + u32CvtShim[1] = r1; + const n0 = uint64CvtShim[0]; + return n0; + } finally { + wasm.__wbindgen_add_to_stack_pointer(16); + } + } + /** + * @param {BigInt} arg0 + */ + set address(arg0) { + uint64CvtShim[0] = arg0; + const low0 = u32CvtShim[0]; + const high0 = u32CvtShim[1]; + wasm.__wbg_set_decodedaddress_address(this.ptr, low0, high0); + } + /** + * @returns {string} + */ + get function_name() { + try { + const retptr = wasm.__wbindgen_add_to_stack_pointer(-16); + wasm.decodedaddress_function_name(retptr, this.ptr); + var r0 = getInt32Memory0()[retptr / 4 + 0]; + var r1 = getInt32Memory0()[retptr / 4 + 1]; + return getStringFromWasm0(r0, r1); + } finally { + wasm.__wbindgen_add_to_stack_pointer(16); + wasm.__wbindgen_free(r0, r1); + } + } + /** + * @param {string} function_name + */ + set function_name(function_name) { + var ptr0 = passStringToWasm0(function_name, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + var len0 = WASM_VECTOR_LEN; + wasm.decodedaddress_set_function_name(this.ptr, ptr0, len0); + } + /** + * @returns {string} + */ + get location() { + try { + const retptr = wasm.__wbindgen_add_to_stack_pointer(-16); + wasm.decodedaddress_location(retptr, this.ptr); + var r0 = getInt32Memory0()[retptr / 4 + 0]; + var r1 = getInt32Memory0()[retptr / 4 + 1]; + return getStringFromWasm0(r0, r1); + } finally { + wasm.__wbindgen_add_to_stack_pointer(16); + wasm.__wbindgen_free(r0, r1); + } + } + /** + * @param {string} location + */ + set location(location) { + var ptr0 = passStringToWasm0(location, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + var len0 = WASM_VECTOR_LEN; + wasm.decodedaddress_set_location(this.ptr, ptr0, len0); + } +} + +async function load(module, imports) { + if (typeof Response === 'function' && module instanceof Response) { + if (typeof WebAssembly.instantiateStreaming === 'function') { + try { + return await WebAssembly.instantiateStreaming(module, imports); + + } catch (e) { + if (module.headers.get('Content-Type') != 'application/wasm') { + console.warn("`WebAssembly.instantiateStreaming` failed because your server does not serve wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n", e); + + } else { + throw e; + } + } + } + + const bytes = await module.arrayBuffer(); + return await WebAssembly.instantiate(bytes, imports); + + } else { + const instance = await WebAssembly.instantiate(module, imports); + + if (instance instanceof WebAssembly.Instance) { + return { instance, module }; + + } else { + return instance; + } + } +} + +async function init(input) { + if (typeof input === 'undefined') { + input = new URL('esp_exception_decoder_rs_bg.wasm', import.meta.url); + } + const imports = {}; + imports.wbg = {}; + imports.wbg.__wbindgen_object_drop_ref = function(arg0) { + takeObject(arg0); + }; + imports.wbg.__wbg_decodedaddress_new = function(arg0) { + var ret = DecodedAddress.__wrap(arg0); + return addHeapObject(ret); + }; + imports.wbg.__wbg_new_949bbc1147195c4e = function() { + var ret = new Array(); + return addHeapObject(ret); + }; + imports.wbg.__wbg_push_284486ca27c6aa8b = function(arg0, arg1) { + var ret = getObject(arg0).push(getObject(arg1)); + return ret; + }; + imports.wbg.__wbindgen_throw = function(arg0, arg1) { + throw new Error(getStringFromWasm0(arg0, arg1)); + }; + + if (typeof input === 'string' || (typeof Request === 'function' && input instanceof Request) || (typeof URL === 'function' && input instanceof URL)) { + input = fetch(input); + } + + + + const { instance, module } = await load(await input, imports); + + wasm = instance.exports; + init.__wbindgen_wasm_module = module; + + return wasm; +} + +export default init; + diff --git a/stacktrace/esp_exception_decoder_rs_bg.wasm b/stacktrace/esp_exception_decoder_rs_bg.wasm new file mode 100644 index 0000000..e19f193 Binary files /dev/null and b/stacktrace/esp_exception_decoder_rs_bg.wasm differ diff --git a/stacktrace/index.html b/stacktrace/index.html new file mode 100644 index 0000000..c4f2a2a --- /dev/null +++ b/stacktrace/index.html @@ -0,0 +1,181 @@ + + + + + + NukiHub Stack trace decoder + + + + + + +
+
+

NukiHub Stack Trace Decoder

+
+
+
+
+

Binary:

+ +
+
+

Stack trace:

+ + +
+ +
+ + + + \ No newline at end of file