Merge remote-tracking branch 'origin/develop' into jm@add-bluetooth

Makefile

@@ -62,8 +62,10 @@ show-app:
 DEFINES   += OS_IO_SEPROXYHAL
 DEFINES   += HAVE_BAGL HAVE_SPRINTF
 DEFINES   += HAVE_IO_USB HAVE_L4_USBLIB IO_USB_MAX_ENDPOINTS=6 IO_HID_EP_LENGTH=64 HAVE_USB_APDU
+DEFINES   += HAVE_LEGACY_PID
 DEFINES   += VERSION=\"$(APPVERSION)\" APPVERSION_M=$(APPVERSION_M)
 DEFINES   += COMMIT=\"$(COMMIT)\" APPVERSION_N=$(APPVERSION_N) APPVERSION_P=$(APPVERSION_P)
+# DEFINES   += _Static_assert\(...\)=
 
 ifeq ($(TARGET_NAME),TARGET_NANOX)
 APP_LOAD_PARAMS += --appFlags 0x240 # with BLE support

nix/release.sh

@@ -0,0 +1,30 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p gitAndTools.hub coreutils
+
+root="$(cd "$(dirname "${BASH_SOURCE[0]}")" && git rev-parse --show-toplevel)"
+
+nano_s_tarball=$("$root/nix/build.sh" -A "nano.s.release.all" "$@")
+nano_x_tarball=$("$root/nix/build.sh" -A "nano.x.release.all" "$@")
+
+cp -f $nano_s_tarball nano-s-release.tar.gz
+cp -f $nano_x_tarball nano-x-release.tar.gz
+
+# hub release create \
+#   -a $nano_s_tarball'#'nano-s-release.tar.gz \
+#   -a $nano_x_tarball'#'nano-x-release.tar.gz \
+#   -F -
+
+echo '## Checksums'
+echo '### nano-s-release.tar.gz'
+echo 'Type | Value'
+echo '-- | --'
+echo "MD5 | $(md5sum nano-s-release.tar.gz | cut -f1 -d' ')"
+echo "SHA256 | $(sha256sum nano-s-release.tar.gz | cut -f1 -d' ')"
+echo "SHA512 | $(sha512sum nano-s-release.tar.gz | cut -f1 -d' ')"
+
+echo '### nano-x-release.tar.gz'
+echo 'Type | Value'
+echo '-- | --'
+echo "MD5 | $(md5sum nano-x-release.tar.gz | cut -f1 -d' ')"
+echo "SHA256 | $(sha256sum nano-x-release.tar.gz | cut -f1 -d' ')"
+echo "SHA512 | $(sha512sum nano-x-release.tar.gz | cut -f1 -d' ')"

src/ui_nano_s.c

@@ -229,10 +229,18 @@ void ui_display(const bagl_element_t *elems, size_t sz, ui_callback_t ok_c, ui_c
     if (!is_idling()) {
         switch_screen(0);
     }
+#if CX_APILEVEL < 10
     ux.elements = elems;
     ux.elements_count = sz;
     ux.button_push_handler = button_handler;
     ux.elements_preprocessor = prepro;
+#else
+    ux.stack[0].element_arrays[0].element_array = elems;
+    ux.stack[0].element_arrays[0].element_array_count = sz;
+    ux.stack[0].element_arrays_count=1;
+    ux.stack[0].button_push_callback = button_handler;
+    G_ux.stack[0].screen_before_element_display_callback = prepro;
+#endif
     UX_WAKE_UP();
     UX_REDISPLAY();
 }