Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 1106fcf
Merge: 08de49d d57088a
Author: bunnie <[email protected]>
Date:   Wed Nov 16 22:35:11 2022 +0800

    Merge pull request betrusted-io#277 from gsora/feat/slider-widget

    feat: user interaction-enabled slider

commit d57088a
Author: Gianguido Sorà <[email protected]>
Date:   Wed Nov 16 14:45:46 2022 +0100

    feat: add tests for slider

commit 5243e8c
Author: Gianguido Sorà <[email protected]>
Date:   Mon Nov 14 19:36:25 2022 +0100

    feat: user interaction-enabled slider

    This commit adds `modals::Modals::slider()` with the same interface as
    `modals::Modals::start_progress()`, with the striking difference that
    users can move the slider, and press the center keypad button to confirm
     the selection.

     Useful for objects like audio volume controls.

commit 08de49d
Author: bunnie <[email protected]>
Date:   Tue Nov 15 02:25:22 2022 +0800

    make testing a little more ergonomic

commit ef5c056
Author: bunnie <[email protected]>
Date:   Tue Nov 15 02:23:13 2022 +0800

    add a quick and dirty test command for headphone state

commit 04f700a
Author: bunnie <[email protected]>
Date:   Tue Nov 15 02:23:01 2022 +0800

    add headphone state polling to codec

commit 474a02c
Author: bunnie <[email protected]>
Date:   Wed Nov 9 15:06:51 2022 +0800

    refactor all vault db retrieval to use new API

    This refactors the remaining vault accessor routines to use
    the new more efficient key pre-fetching routine. This also
    fixes up an error in test case generation and hopefully resolves
    an issue with concurrency errors using the older version of
    the access routine.

commit c3ba30d
Author: bunnie <[email protected]>
Date:   Wed Nov 9 14:25:26 2022 +0800

    expand on errors reported

commit e7e110c
Author: bunnie <[email protected]>
Date:   Wed Nov 9 14:25:05 2022 +0800

    cleanup and enhance test cases

commit 6d1d297
Author: bunnie <[email protected]>
Date:   Wed Nov 9 01:01:42 2022 +0800

    bump ring-xous to track latest PR

commit 11a0107
Author: bunnie <[email protected]>
Date:   Wed Nov 9 00:33:13 2022 +0800

    fix UX state after button press on dynamic modal

    This bug was hidden by the previous return of state before
    the reliquish.

    Now with the correct ordering, we end up getting a double-relinquish
    which ends up trying to swap a modal into focus which doesn't exist.

    This fixes that edge case

commit 4c45dfa
Author: bunnie <[email protected]>
Date:   Wed Nov 9 00:33:01 2022 +0800

    more debugging help

commit 1129f1c
Author: bunnie <[email protected]>
Date:   Mon Nov 7 23:05:32 2022 +0800

    bump versions after xous-names bump

commit a7162fd
Author: bunnie <[email protected]>
Date:   Mon Nov 7 22:19:38 2022 +0800

    bump xous-names dependents

commit 28f42ba
Merge: 1bc39cd 3ca323f
Author: bunnie <[email protected]>
Date:   Mon Nov 7 22:09:56 2022 +0800

    Merge pull request betrusted-io#274 from betrusted-io/xous-names-tryconnect

    Add TryConnect call to xous-names

commit 3ca323f
Author: Sean Cross <[email protected]>
Date:   Mon Nov 7 18:46:02 2022 +0800

    xous-names: implement non-blocking TryConnect call

    This call can be used by clients to try connecting to a service. If the
    service is not available, this will fail to connect.

    Signed-off-by: Sean Cross <[email protected]>

commit 3ca57bc
Author: Sean Cross <[email protected]>
Date:   Mon Nov 7 18:45:25 2022 +0800

    xous-api-names: add TryConnect

    This is a non-blocking version of Connect that is fallible.

    Signed-off-by: Sean Cross <[email protected]>

commit 1bc39cd
Author: bunnie <[email protected]>
Date:   Mon Nov 7 00:25:16 2022 +0800

    bump release notes

commit 781776b
Author: bunnie <[email protected]>
Date:   Mon Nov 7 00:22:49 2022 +0800

    move the mount initiator back into status; fix waiting signal

    mount initiator is now back inside of the status thread
    (woo, no more app-specific dependency) and there is now a
    wait on "attempted to mount" inside the status thread which is
    the signal to clear the "waiting on boot" message.

commit 0646ec2
Author: bunnie <[email protected]>
Date:   Mon Nov 7 00:21:52 2022 +0800

    track "attempted" mounts in PDDB

    this is to allow a UX process to clear the "waiting for boot"
    indicator once an attempt has completed.

    right now, it responds *after* the mount process is done,
    so the "please waiting" text persists even doing a format.

    I think that is...appropriate?

commit 93dcfb7
Author: bunnie <[email protected]>
Date:   Mon Nov 7 00:21:27 2022 +0800

    fix hosted mode

commit 335b78d
Author: bunnie <[email protected]>
Date:   Sun Nov 6 20:50:15 2022 +0800

    fix polarity of init_done flag. oops.

commit 1d7641c
Author: bunnie <[email protected]>
Date:   Sun Nov 6 18:48:23 2022 +0800

    force please wait message to clear before doing PDDB init

    While it's a kind of neat effect to have the "please wait"
    message persist right up until the point where the dialog box
    pops up, the problem is that the blit of the backplane captures
    that, so when the context is reverted that message is still there.

    On a very fast mount (empty PDDB under Renode emulation) the
    mounting call finishes so quickly that the dialog box that would
    normally trigger the redraw to clear this message never renders.

    This patch forces the screen to blank before trying to call
    PDDB init, ensuring that we don't have that persist after the
    mount, even if it is very fast.

    The downside is there is a fraction of a second where the please
    wait disappears, and the dialog box pops up. That is just the
    time it takes for the system to setup for the cryptographic
    operations.

commit 382380b
Author: bunnie <[email protected]>
Date:   Sun Nov 6 18:48:06 2022 +0800

    fix Sender cast

commit 3ee36f4
Author: bunnie <[email protected]>
Date:   Sun Nov 6 18:45:17 2022 +0800

    remove UX delays on PDDB path

    retain just one of them going into the erase routine, because
    it consumes enough CPU that the dialog box takes a bit too long to
    pop up.

commit 880675c
Author: bunnie <[email protected]>
Date:   Sun Nov 6 18:44:56 2022 +0800

    remove UX delays between dialog boxes

commit ffa8385
Author: bunnie <[email protected]>
Date:   Sun Nov 6 18:36:20 2022 +0800

    refactor: send response packet after context has been switched

    This refactor (at least partially) fixes a "mystery delay"
    sometimes required after a dialog box swaps out. The previous
    implementation would send the response, and then swap the contexts.
    This would often cause the recipient to start drawing its UX
    before the calling app was foregrounded, causing elements to go
    missing.

    This refactor puts the response after the context swap. The main
    downside is it requires every type of modal to have a GAM
    handle to issue the redraw call, and is especially complicated
    by the fact that GAM is not clone-friendly. However, the
    trade-offs of either creating a handle dynamically or storing
    one in the object is probably worth the benefit of removing
    an open-loop delay.

commit b0f443b
Author: bunnie <[email protected]>
Date:   Sun Nov 6 16:33:31 2022 +0800

    fix race condition on relinquish focus v result return for dynamic and progress modals

    There's a race condition between the return of a blocking scalar
    and when focus is relinquished.

    This causes chained graphics operations to get dropped sometimes.

    Move the return result to after the focus switch; this allows us
    to elimate some dead waits.

commit 5a0e3e5
Author: bunnie <[email protected]>
Date:   Sun Nov 6 15:59:58 2022 +0800

    clean up bitrot in dbg-ecupdate configuration

commit 69cf629
Author: bunnie <[email protected]>
Date:   Sun Nov 6 04:25:26 2022 +0800

    fix problem in tts build

commit 767580d
Author: bunnie <[email protected]>
Date:   Sun Nov 6 04:17:53 2022 +0800

    bump versions

commit 30583bd
Author: bunnie <[email protected]>
Date:   Sun Nov 6 03:48:12 2022 +0800

    bump versions with xous change

commit e85455a
Merge: a16304b c9f751f
Author: bunnie <[email protected]>
Date:   Sun Nov 6 03:44:58 2022 +0800

    Merge pull request betrusted-io#271 from betrusted-io/scalar5-support

    Scalar5 support

commit a16304b
Author: bunnie <[email protected]>
Date:   Sun Nov 6 03:42:07 2022 +0800

    bump release notes

commit 2a11f9d
Merge: 1ca0ef7 fa90e74
Author: bunnie <[email protected]>
Date:   Sun Nov 6 03:40:37 2022 +0800

    Merge branch 'main' of github.com:betrusted-io/xous-core into main

commit fa90e74
Merge: 4264231 817e758
Author: bunnie <[email protected]>
Date:   Sun Nov 6 03:40:17 2022 +0800

    Merge pull request betrusted-io#270 from gsora/feat/pddb-init-notification

    feat: show boot process notifications for PDDB

commit 817e758
Author: bunnie <[email protected]>
Date:   Sun Nov 6 03:36:43 2022 +0800

    remove the dead-wait before the PDDB is mounted

    the "right" way to do this is to poll to see if trusted init is
    done. once that is done, you can go ahead and try to mount the
    PDDB.

commit a56b8c8
Author: bunnie <[email protected]>
Date:   Sun Nov 6 03:11:23 2022 +0800

    add automounter to shellchat, and initial wait message

    The initial wait message is drawn directly under where
    the modals would appear, so the message "goes away"
    when modals pop up.

    There's still a bit of trickiness around the timing of
    some of the calls. Attempting to mount the PDDB too early
    before all the contexts have been registered leads to
    a lot of needless defacing.

    Also, the final redraw needs a short delay to allow
    the system to foreground shellchat again after closing
    the modals.

commit e240ca6
Author: bunnie <[email protected]>
Date:   Sun Nov 6 03:10:00 2022 +0800

    refactor the hardware boot screen

    - remove a blanking operation. this makes the transision from
    loader to runtime almost imperceptably smoother
    - add the ability to summon the logo screen earlier in the process

    Note that only GAM can call GFX, so, it's alright to expose that
    API, since GAM should gate-keep and prevent abuse of that function.

commit 7eecf2b
Author: bunnie <[email protected]>
Date:   Sun Nov 6 03:07:35 2022 +0800

    remove the initial wait from PDDB; move the pop-up modal location

    The initial wait message is now rendered by the first app
    that owns the screen (currently shellchat).

    The location where the pop-up modal is rendered is also now bracketed
    directly around the mount call to avoid interference with other
    edge cases that may pop up modals.

commit 0d02415
Author: bunnie <[email protected]>
Date:   Sun Nov 6 03:05:30 2022 +0800

    remove automounter from the status thread

    it's now in shellchat. In general, the program that is assigned
    as the initial app context is responsible for ensuring the
    PDDB is mounted. Thus, if `vault` were to become a stand-alone app,
    it should include some code to make sure the PDDB is mounted as
    part of its boot sequence.

    The reason is that it allows the initial app to guide the
    power-on experience, instead of delegating this to the `status`
    bar, which is oblivious to the state of the app.

commit 45009a0
Author: bunnie <[email protected]>
Date:   Sat Nov 5 23:06:47 2022 +0800

    add debugging hints for figuring out context switch bugs in the future

commit 7c4ca05
Author: bunnie <[email protected]>
Date:   Sat Nov 5 23:06:18 2022 +0800

    adjust modal trust level down so it's not identical to chat

commit c9f751f
Author: Sean Cross <[email protected]>
Date:   Sat Nov 5 18:44:01 2022 +0800

    xous: add api support for scalar5

    With the addition of scalar5, existing api calls must be updated to take
    advantage of it. This will allow `send_message()` to return a `scalar5`.

    Signed-off-by: Sean Cross <[email protected]>

commit da56475
Author: Sean Cross <[email protected]>
Date:   Sat Nov 5 18:39:54 2022 +0800

    kernel: syscall: add support for return_scalar5

    Add kernel support for returning 5 scalars.

    Signed-off-by: Sean Cross <[email protected]>

commit c8bb039
Author: Sean Cross <[email protected]>
Date:   Sat Nov 5 18:39:06 2022 +0800

    xous: add api support for `Scalar5`

    Add syscall and return definitions for Scalar5, as well as
    ReturnScalar5. This will enable us to pass up to five scalars as a
    return from a blockingscalar call.

    Signed-off-by: Sean Cross <[email protected]>

commit 1ca0ef7
Author: bunnie <[email protected]>
Date:   Sat Nov 5 16:30:29 2022 +0800

    clean up warning

commit 601f347
Author: bunnie <[email protected]>
Date:   Sat Nov 5 16:19:15 2022 +0800

    initial delay on NTP poller

    no point in clogging up the boot sequence with requests that
    will almost certainly fail.

commit d277ae9
Author: Gianguido Sorà <[email protected]>
Date:   Fri Nov 4 17:31:27 2022 +0100

    feat: show boot process notifications for PDDB

    This commit shows two notifications:
     1. as soon as the device boots, a notification greets the user and
     tells them everything is fine, the device is booting
     2. as soon as the user enters (or doesn't) enter the password, a
     notification tell the user Xous is loading and mounting PDDB

    I spent too much time on this but I believe it's a nice UX improvement.

commit 4264231
Merge: 5de44a9 f861af7
Author: bunnie <[email protected]>
Date:   Fri Nov 4 17:06:40 2022 +0800

    Merge branch 'main' of github.com:betrusted-io/xous-core into main

commit 5de44a9
Author: bunnie <[email protected]>
Date:   Fri Nov 4 17:05:51 2022 +0800

    don't fail if keyattribute not found in current basis when no basis specified

    This is not actually an error, we just need to try another basis
    down the list. This is a copypasta bug that was only caught now. :-/

commit 0d9a39a
Author: bunnie <[email protected]>
Date:   Fri Nov 4 17:05:32 2022 +0800

    print debug information when a key goes missing in bulk read

    this helps debug problems down the road

commit f861af7
Author: Sean Cross <[email protected]>
Date:   Fri Nov 4 12:27:13 2022 +0800

    tools: elf: fix copy-elf when gcc links program

    GCC will set the text size to `0` in a certain case that `rust-lld` did
    not. This causes the elf copier to add about 512 MB to the image which
    it otherwise shouldn't be doing.

    Add a workaround that appears to fix the issue.

    Signed-off-by: Sean Cross <[email protected]>

commit 3a84578
Author: Sean Cross <[email protected]>
Date:   Fri Nov 4 12:26:05 2022 +0800

    loader: fix build with gcc-ld

    With Rust 1.65.0, we may be forced to use gdb's linker due to bug that
    appeared in llvm-15:

    rust-lang/rust#103949

    Signed-off-by: Sean Cross <[email protected]>

commit d74673a
Author: bunnie <[email protected]>
Date:   Fri Nov 4 03:55:57 2022 +0800

    allow main menu to be used if there are no root keys

commit ed09ee0
Author: bunnie <[email protected]>
Date:   Fri Nov 4 03:53:03 2022 +0800

    bump to latest ring-xous version

commit af91ec9
Author: bunnie <[email protected]>
Date:   Thu Nov 3 23:28:08 2022 +0800

    bump release notes

commit 80a1bd3
Author: bunnie <[email protected]>
Date:   Thu Nov 3 23:18:13 2022 +0800

    resolve issue betrusted-io#267

commit 4dc7135
Author: bunnie <[email protected]>
Date:   Thu Nov 3 23:06:20 2022 +0800

    update the instructions to build soc.svd, and add note about verification

commit 01f660b
Author: bunnie <[email protected]>
Date:   Thu Nov 3 21:11:58 2022 +0800

    didn't meant to check in that script

commit ff2a7f8
Author: bunnie <[email protected]>
Date:   Thu Nov 3 21:06:04 2022 +0800

    some more debugging to help trace through dict sync issues

commit b04dcc2
Author: bunnie <[email protected]>
Date:   Thu Nov 3 21:04:14 2022 +0800

    add `smalldb` flag, which builds a PDDB with a size of 4MiB

    do not interchange this on devices with the full sized
    PDDB, you may corrupt the database

commit 6c2e86d
Author: bunnie <[email protected]>
Date:   Thu Nov 3 21:03:40 2022 +0800

    add support for small-sized PDDB images plus some debugging info

commit 5c624e7
Author: bunnie <[email protected]>
Date:   Thu Nov 3 21:01:11 2022 +0800

    add a flush after every PDDB write

    uncommitted data will lead to corruption later on

commit c91837c
Author: bunnie <[email protected]>
Date:   Thu Nov 3 18:33:22 2022 +0800

    fix max dicts in analyzer scripts

commit 719020b
Author: bunnie <[email protected]>
Date:   Thu Nov 3 17:23:11 2022 +0800

    don't allow polls to the unmount to turn true until other callbacks have been allowed

commit 3bdf157
Author: bunnie <[email protected]>
Date:   Thu Nov 3 17:22:22 2022 +0800

    enhance debugging output on pddb analyzer

commit 779cc61
Author: Sean Cross <[email protected]>
Date:   Thu Nov 3 12:31:22 2022 +0800

    emulation: spinor: implement erasesector4byte

    Implement this command, which is used by the system for bulk erases.

    Signed-off-by: Sean Cross <[email protected]>

commit 0c52a7a
Author: bunnie <[email protected]>
Date:   Thu Nov 3 01:58:36 2022 +0800

    the merge requested pulled multiple other crate versions backwards

    this fixes it, hopefully.

commit c04cc0e
Merge: 7af04b7 f59bbc2
Author: bunnie <[email protected]>
Date:   Thu Nov 3 01:54:00 2022 +0800

    Merge branch 'main' of github.com:betrusted-io/xous-core into main

commit f59bbc2
Merge: ebc0739 6332bf1
Author: bunnie <[email protected]>
Date:   Thu Nov 3 01:53:38 2022 +0800

    Merge pull request betrusted-io#266 from Foundation-Devices/driver-refactor

    kernel: Drivers refactor.

commit 6332bf1
Merge: 2cf4622 ebc0739
Author: bunnie <[email protected]>
Date:   Thu Nov 3 01:53:23 2022 +0800

    Merge branch 'main' into driver-refactor

commit 2cf4622
Author: bunnie <[email protected]>
Date:   Thu Nov 3 01:50:36 2022 +0800

    commit lockfile and verification pins

commit 80094ae
Author: bunnie <[email protected]>
Date:   Thu Nov 3 01:49:28 2022 +0800

    I see what's happening. The PR originator versions are very out of date.

    hopefully this fixes the issue.

commit bbb7e27
Author: bunnie <[email protected]>
Date:   Thu Nov 3 01:42:59 2022 +0800

    bump kernel version (this time with feeling)

commit ba46c6b
Author: bunnie <[email protected]>
Date:   Thu Nov 3 01:41:24 2022 +0800

    bump kernel version

commit 7af04b7
Author: bunnie <[email protected]>
Date:   Thu Nov 3 01:38:18 2022 +0800

    a bit more debugging around dictionary creation

commit 6d2be1b
Author: bunnie <[email protected]>
Date:   Wed Nov 2 21:52:28 2022 +0800

    add va printouts

commit d8807e6
Author: Jean-Pierre De Jesus DIAZ <[email protected]>
Date:   Wed Nov 2 14:29:53 2022 +0100

    kernel: Move rand driver to platform module.

    Signed-off-by: Jean-Pierre De Jesus DIAZ <[email protected]>

commit b334e5b
Author: Jean-Pierre De Jesus DIAZ <[email protected]>
Date:   Wed Nov 2 13:30:20 2022 +0100

    kernel: Split debug shell and uart driver.

    I've added a `platform` module to store all platform specific code, (not
    architecture specific) as some platforms will require custom drivers, e.g.
    for debug output and for the random number generation code.  The platform
    code is in charge of mapping any peripherals needed to work, also to
    initialize any other parts of the kernel that require drivers, for example
    the debug shell.

    Signed-off-by: Jean-Pierre De Jesus DIAZ <[email protected]>

commit ebc0739
Author: bunnie <[email protected]>
Date:   Tue Nov 1 21:25:04 2022 +0800

    fix some defaults to make the Renode path cleaner to start

commit f738781
Author: bunnie <[email protected]>
Date:   Tue Nov 1 21:18:33 2022 +0800

    make the default pin 'a', as it is on Renode

commit 4e2d799
Author: bunnie <[email protected]>
Date:   Tue Nov 1 21:17:07 2022 +0800

    upgrade pdddbg to use basis decryption routines from the common libs

commit 54e929e
Author: bunnie <[email protected]>
Date:   Tue Nov 1 19:01:57 2022 +0800

    move key extraction routines to pddbcommon.py

commit 05068c5
Author: bunnie <[email protected]>
Date:   Tue Nov 1 13:03:52 2022 +0800

    extract the renode key box as a dump

commit c74ceac
Author: bunnie <[email protected]>
Date:   Mon Oct 31 22:33:27 2022 +0800

    add a renode mode for reading in a renode.bin

commit a0dca39
Author: bunnie <[email protected]>
Date:   Mon Oct 31 22:14:10 2022 +0800

    key file for decrypting .System basis on Renode

commit 0525266
Author: Tom Marble <[email protected]>
Date:   Sat Oct 29 17:38:22 2022 -0500

    Updates mtxcli README

    Signed-off-by: Tom Marble <[email protected]>

commit 604a376
Author: Tom Marble <[email protected]>
Date:   Sat Oct 29 17:34:32 2022 -0500

    Adds images of mtxcli

    Images of mtxcli
    - in the hosted environment
    - on the Precusor
    - in French

    Signed-off-by: Tom Marble <[email protected]>

commit 072170e
Author: bunnie <[email protected]>
Date:   Sat Oct 29 18:01:18 2022 +0800

    restore the top-level settings file per xobs suggestion

commit 2fd685c
Merge: 052817c 38286d8
Author: Sean Cross <[email protected]>
Date:   Sat Oct 29 04:52:48 2022 -0400

    Merge pull request betrusted-io#263 from sorpaas/sp-rename

    RemoveClockEntry -> TryRemoveClockEntry

commit 38286d8
Author: Wei Tang <[email protected]>
Date:   Sat Oct 29 10:47:47 2022 +0200

    RemoveClockEntry -> TryRemoveClockEntry

commit 052817c
Merge: 3814337 9689b3b
Author: bunnie <[email protected]>
Date:   Sat Oct 29 00:39:27 2022 +0800

    Merge pull request betrusted-io#261 from betrusted-io/remove-vscode

    Removes VS Code artifacts

commit 9689b3b
Author: Tom Marble <[email protected]>
Date:   Fri Oct 28 11:23:56 2022 -0500

    Removes VS Code artifacts

    Also updates .gitignore to prevent adding IDE (VS Code, Emacs) artifacts

    Signed-off-by: Tom Marble <[email protected]>

commit 3814337
Author: bunnie <[email protected]>
Date:   Fri Oct 28 18:27:52 2022 +0800

    don't check in vscode settings

commit dd379aa
Author: bunnie <[email protected]>
Date:   Fri Oct 28 18:16:16 2022 +0800

    bump kernel version

commit f01b2a8
Author: bunnie <[email protected]>
Date:   Fri Oct 28 18:12:07 2022 +0800

    add some vscode stuff i guess to the release

commit f17e024
Author: bunnie <[email protected]>
Date:   Fri Oct 28 18:02:52 2022 +0800

    bump kernel revision

commit c17a6d3
Author: Sean Cross <[email protected]>
Date:   Fri Oct 28 17:38:25 2022 +0800

    kernel: make SYSTEM_SERVICES unmangled

    This symbol will be viewed by external tools.

    Signed-off-by: Sean Cross <[email protected]>

commit fd739c2
Author: bunnie <[email protected]>
Date:   Fri Oct 28 15:23:39 2022 +0800

    add `fr` locale to update options

commit f7eed18
Author: bunnie <[email protected]>
Date:   Fri Oct 28 15:18:34 2022 +0800

    bump verification and locks

commit ba28dd8
Author: bunnie <[email protected]>
Date:   Fri Oct 28 15:11:17 2022 +0800

    bump to absorb utralib straggler configs

commit b5f4814
Author: bunnie <[email protected]>
Date:   Fri Oct 28 15:10:00 2022 +0800

    cleanup some stragglers in utralib push

commit 6b296c9
Author: bunnie <[email protected]>
Date:   Fri Oct 28 15:04:56 2022 +0800

    fix a cargo file that got nuked in the merge

commit bcd1078
Author: bunnie <[email protected]>
Date:   Fri Oct 28 15:01:38 2022 +0800

    bump lockfile

commit e60f7cc
Merge: 0c7c90f f8a6643
Author: bunnie <[email protected]>
Date:   Fri Oct 28 15:00:27 2022 +0800

    Merge branch 'i18n/adds-french-localization' into main

commit f8a6643
Author: bunnie <[email protected]>
Date:   Fri Oct 28 14:55:33 2022 +0800

    bump locks

commit dfb10ed
Author: bunnie <[email protected]>
Date:   Fri Oct 28 14:01:09 2022 +0800

    bump crate numbers to publish lang-fr change into xous-rs

commit 006a691
Author: Tom Marble <[email protected]>
Date:   Thu Oct 27 16:07:05 2022 -0500

    Completes the i18n_helper.py tool

    Added 'fr' translation
    Added *.json to .gitattributes

    Signed-off-by: Tom Marble <[email protected]>

commit 0c7c90f
Author: bunnie <[email protected]>
Date:   Fri Oct 28 02:55:42 2022 +0800

    have the core spinor routines automatically retry on failure

    normally we never see these failures, but, as we are seeing
    flash wear-out on the CI machine the writes can take
    long enough that we get some concurrent requests. As a work-around,
    just automatically retry a few times before throwing the error
    back to the caller.

commit d63c452
Author: bunnie <[email protected]>
Date:   Thu Oct 27 23:00:10 2022 +0800

    catch serialization buffer edge case

    if the buffer fills up to the point where there isn't enough
    space for the 8-bytes of header, a split_at() call will fail before
    the routine even gets to decide if the record can fit.

    abort the loop if the buffer is that full.

commit 07cb239
Author: Tom Marble <[email protected]>
Date:   Wed Oct 26 22:32:49 2022 -0500

    WIP: Adds new lang 'fr' for French

    Adds new Internationalization Helper tool: i18n_helper.py

    Signed-off-by: Tom Marble <[email protected]>
  • Loading branch information
@gsora
gsora committed Nov 17, 2022
1 parent e0a46dd commit aa44834
Show file tree
Hide file tree
Showing 11 changed files with 169 additions and 4 deletions.
11 changes: 11 additions & 0 deletions services/codec/src/api.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,21 @@ pub(crate) enum Opcode {
/// set headphone volume -- L&R channels are ganged together in this API, but codec can do separately
SetHeadphoneVolume,

/// get headphone type code
GetHeadphoneCode,

/// Suspend/resume callback
SuspendResume,
}

#[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive)]
pub enum HeadphoneState {
NotPresent = 0,
PresentWithMic = 1,
PresentWithoutMic = 2,
Reserved = 3,
CodecOff = 4,
}

#[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive)]
pub enum VolumeOps {
Expand Down
4 changes: 3 additions & 1 deletion services/codec/src/backend/tlv320aic3100.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,9 @@ impl Codec {
pub fn get_headset_code(&mut self) -> u8 {
self.w(0, &[0]);
let mut code: [u8; 1] = [0; 1];
self.r(67, &mut code);
if !self.r(67, &mut code) {
log::warn!("headset code read unsuccessful");
};
code[0]
}

Expand Down
14 changes: 14 additions & 0 deletions services/codec/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,20 @@ impl Codec {
_ => Err(xous::Error::InternalError)
}
}
pub fn poll_headphone_state(&self) -> Result<HeadphoneState, xous::Error> {
match send_message(self.conn,
Message::new_blocking_scalar(Opcode::GetHeadphoneCode.to_usize().unwrap(), 0, 0, 0, 0)
) {
Ok(xous::Result::Scalar1(code)) => {
let retcode: Option<HeadphoneState> = FromPrimitive::from_usize(code);
match retcode {
Some(code) => Ok(code),
None => Err(xous::Error::InternalError),
}
}
_ => Err(xous::Error::InternalError)
}
}
}

use core::sync::atomic::{AtomicU32, Ordering};
Expand Down
23 changes: 23 additions & 0 deletions services/codec/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,29 @@ fn main() -> ! {
};
codec.set_headphone_gain_db(headphone_analog_gain_db, headphone_analog_gain_db);
}),
Some(api::Opcode::GetHeadphoneCode) => xous::msg_blocking_scalar_unpack!(msg, _, _, _, _, {
if codec.is_init() && codec.is_on() {
let hp_code = codec.get_headset_code();
if hp_code & 0x80 != 0x80 {
log::warn!("Headphone detection polled, but detection is not enabled in hardware!");
}
log::debug!("headset code: 0x{:x}", hp_code);
let code = if hp_code == 0xff { // kind of a hack, we could also check codec power state
HeadphoneState::CodecOff
} else {
match (hp_code >> 5) & 0x3 {
0b00 => HeadphoneState::NotPresent,
0b01 => HeadphoneState::PresentWithoutMic,
0b10 => HeadphoneState::Reserved,
0b11 => HeadphoneState::PresentWithMic,
_ => HeadphoneState::Reserved,
}
};
xous::return_scalar(msg.sender, code as usize).ok();
} else {
xous::return_scalar(msg.sender, HeadphoneState::CodecOff as usize).ok();
}
}),
None => {
log::error!("couldn't convert opcode");
break
Expand Down
8 changes: 8 additions & 0 deletions services/gam/src/modal.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,14 @@ impl TextEntryPayload {
}
}

#[derive(Debug, Copy, Clone, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize)]
pub struct SliderPayload(pub u32);
impl SliderPayload {
pub fn new(value: u32) -> Self {
SliderPayload(value)
}
}

#[derive(Debug, Copy, Clone, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize)]
pub struct RadioButtonPayload(pub ItemName); // returns the name of the item corresponding to the radio button selection
impl RadioButtonPayload {
Expand Down
12 changes: 10 additions & 2 deletions services/gam/src/modal/slider.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ impl Slider {
show_legend,
}
}

pub fn set_is_progressbar(&mut self, setting: bool) {
self.is_progressbar = setting;
}

pub fn set_is_password(&mut self, setting: bool) {
// this will cause text to be inverted. Untrusted entities can try to set this,
// but the GAM should defeat this for dialog boxes outside of the trusted boot
Expand Down Expand Up @@ -194,8 +199,11 @@ impl ActionApi for Slider {
gam.relinquish_focus().unwrap();
xous::yield_slice();

send_message(self.action_conn,
xous::Message::new_scalar(self.action_opcode as usize, self.action_payload as usize, 0, 0, 0)).expect("couldn't pass on action payload");
let ret_payload = SliderPayload(self.action_payload);

let buf = Buffer::into_buf(ret_payload).expect("couldn't convert message to payload");
buf.send(self.action_conn, self.action_opcode).map(|_| ()).expect("couldn't send action message");

return None;
}
_ => {
Expand Down
4 changes: 4 additions & 0 deletions services/modals/src/api.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ pub struct ManagedProgress {
pub end_work: u32,
/// current quanta of work. Used to int the bar, updates are just a scalar with the same value.
pub current_work: u32,
/// can user interact with it?
pub user_interaction: bool,
}

/// This isn't a terribly useful notification -- it's basically read-only, no interactivity,
Expand Down Expand Up @@ -98,6 +100,8 @@ pub(crate) enum Opcode {
Bip39 = 31, // ---- note op number
Bip39Input = 32, // ----- note op number
Bip39Return = 33, // ----- note op number
SliderReturn = 34,
Slider = 35,
/// display an image
#[cfg(feature = "ditherpunk")]
Image = 3,
Expand Down
27 changes: 27 additions & 0 deletions services/modals/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,13 +302,40 @@ impl Modals {
start_work: start,
end_work: end,
current_work: current,
user_interaction: false,
};
let buf = Buffer::into_buf(spec).or(Err(xous::Error::InternalError))?;
buf.lend(self.conn, Opcode::StartProgress.to_u32().unwrap())
.or(Err(xous::Error::InternalError))?;
Ok(())
}

pub fn slider(
&self,
title: &str,
start: u32,
end: u32,
current: u32,
) -> Result<u32, xous::Error> {
self.lock();
let spec = ManagedProgress {
token: self.token,
title: xous_ipc::String::from_str(title),
start_work: start,
end_work: end,
current_work: current,
user_interaction: true,
};
let mut buf = Buffer::into_buf(spec).or(Err(xous::Error::InternalError))?;
buf.lend_mut(self.conn, Opcode::Slider.to_u32().unwrap())
.or(Err(xous::Error::InternalError))?;

let orig = buf.to_original::<SliderPayload, _>().unwrap();

self.unlock();
Ok(orig.0)
}

/// note that this API is not atomically token-locked, so, someone could mess with the progress bar state
/// but, progress updates are meant to be fast and frequent, and generally if a progress bar shows
/// something whacky it's not going to affect a security outcome
Expand Down
48 changes: 47 additions & 1 deletion services/modals/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ fn wrapped_main() -> ! {
let mut fixed_items = Vec::<ItemName>::new();
let mut progress_action = Slider::new(
renderer_cid,
Opcode::Gutter.to_u32().unwrap(),
Opcode::SliderReturn.to_u32().unwrap(),
0,
100,
1,
Expand Down Expand Up @@ -332,6 +332,24 @@ fn wrapped_main() -> ! {
)
.expect("couldn't initiate UX op");
}
Some(Opcode::Slider) => {
let spec = {
let buffer =
unsafe { Buffer::from_memory_message_mut(msg.body.memory_message_mut().unwrap()) };
buffer.to_original::<ManagedProgress, _>().unwrap()
};
if spec.token != token_lock.unwrap_or(default_nonce) {
log::warn!("Attempt to access modals without a mutex lock. Ignoring.");
continue;
}
op = RendererState::RunProgress(spec);
dr = Some(msg);
send_message(
renderer_cid,
Message::new_scalar(Opcode::InitiateOp.to_usize().unwrap(), 0, 0, 0, 0),
)
.expect("couldn't initiate UX op");
}
Some(Opcode::StopProgress) => msg_blocking_scalar_unpack!(msg, t0, t1, t2, t3, {
let token = [t0 as u32, t1 as u32, t2 as u32, t3 as u32];
if token != token_lock.unwrap_or(default_nonce) {
Expand Down Expand Up @@ -593,6 +611,7 @@ fn wrapped_main() -> ! {
end_work
);
progress_action.set_state(last_percentage);
progress_action.set_is_progressbar(!config.user_interaction);
#[cfg(feature = "tts")]
tts.tts_simple(config.title.as_str().unwrap()).unwrap();
renderer_modal.modify(
Expand All @@ -603,6 +622,7 @@ fn wrapped_main() -> ! {
true,
Some(DEFAULT_STYLE),
);

renderer_modal.activate();
}
RendererState::RunRadio(config) => {
Expand Down Expand Up @@ -764,6 +784,32 @@ fn wrapped_main() -> ! {
xous::return_scalar2(sender, 1, k).unwrap();
}
}),
Some(Opcode::SliderReturn) => match op {
RendererState::RunProgress(_) => {
let buffer =
unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) };
let item = buffer.to_original::<SliderPayload, _>().unwrap();

if let Some(mut origin) = dr.take() {
let mut response = unsafe {
Buffer::from_memory_message_mut(
origin.body.memory_message_mut().unwrap(),
)
};

response.replace(item).unwrap();
op = RendererState::None;

token_lock = next_lock(&mut work_queue);
} else {
log::error!("Ux routine returned but no origin was recorded");
panic!("Ux routine returned but no origin was recorded");
}
},
_ => {
log::warn!("got weird stuff on slider return, ignoring");
}
},
Some(Opcode::TextEntryReturn) => match op {
RendererState::RunText(_config) => {
log::trace!("validating text entry modal");
Expand Down
17 changes: 17 additions & 0 deletions services/modals/src/tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,20 @@ pub fn spawn_test() {
}
Err(e) => log::error!("couldn't get input: {:?}", e),
}

// 6. human interaction-enabled slider
log::info!("testing human interaction-enabled slider");
let result = modals.slider(
"Human interaction-enabled slider!",
0,
100,
50,
).expect("slider test failed");

modals.show_notification(&format!("Slider value: {}", result), None)
.expect("cannot show slider result notification");

log::info!("slider test done");
}
});

Expand Down Expand Up @@ -165,6 +179,9 @@ pub fn spawn_test() {
modals.show_image(bm).expect("show image modal failed");
log::info!("image modal test done");
}

// 6. test that human-interactable slider modal
log::info!("testing human interaction-enabled modal");
}
});
}
Expand Down
5 changes: 5 additions & 0 deletions services/shellchat/src/cmds/test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -665,6 +665,11 @@ impl<'a> ShellCmdApi<'a> for Test {
Err(e) => log::error!("couldn't get input: {:?}", e),
}
}
"hpstate" => {
let state = self.codec.poll_headphone_state();
log::info!("{:?}", state);
write!(ret, "{:?}", state).ok();
}
"ecup" => {
let ecup_conn = env.xns.request_connection_blocking("__ECUP server__").unwrap();
xous::send_message(ecup_conn,
Expand Down

0 comments on commit aa44834

Please sign in to comment.