Advanced UI

Simple UI

Background: This was 100% inspired by Lux-Perpetua’s Andúril 2 UI diagram on BLF. In fact, Lux’s diagram is so good, that I would have been happy to just use it except for one thing: the source isn’t published, so you can’t modify it. I also wanted to be able to keep it up to date with u/ToyKeeper’s code. So I created my own…

This is where I intend to store all of my Anduril 2 UI diagrams, and any updates to them. Since ToyKeeper split off the multi-channel version of Anduril 2, I have created two new diagrams for it:

Yeah, it got complicated enough that I could no longer fit the Advanced and Simple UI diagrams on a single page, so I had to split them.

As always, you are free to do whatever you want with these diagrams. I make these for myself, and I’m happy to share them with the community. You can find the source MS Visio file here. Feel free to make your own copy and modify it to your heart’s content. The Visio file contains several pages:

  • Single-Channel - Advanced/Simple UI diagram for the single-channel version of Anduril 2. I still need to update and post it.
  • Multi-Simple - Simple UI diagram for the multi-channel version of Anduril 2.
  • Multi-Advanced - Advanced UI diagram for the multi-channel version of Anduril 2.
  • Diagram Parts - Various bits and pieces that I use in the various UI diagrams.

If you find any errors, please post a comment here. I try to keep the diagrams as accurate and up-to-date as possible, but you know, life happens. Enjoy!

Updates:

  • 2023-07-06: Fixed several issues pointed out here. Thanks @lowprofile!
  • 2023-07-09: Fixed a few more issues pointed out here. Thanks again @lowprofile! Also trying to get the wording in a few places more inline with the text manual.
  • 2023-07-15: Updated for r728 which added channels for red, yellow, green, cyan, blue, purple, and white. Added 4H from ON to Momentary Turbo. Added 3C from Tactical Mode to Next Channel Mode. Several other minor fixes. Huge thanks to @lowprofile for continuing to provide valuable feedback. This multi-channel diagram has been a journey!
  • 2023-07-17: Multiple visual enhancements/fixes thanks to @lowprofile. Incremented the version to r732 even though there were no material impacts to the diagram.
  • 2023-07-20: Modified the ramp part of the diagram to reflect the default Anduril 2 configuration (2C to Ceiling). Thanks again to @lowprofile for feedback. I also switch from revisions to build dates as suggested by ToyKeeper.
  • 2023-07-22: Made several corrections to the Simple UI diagram that I had been neglecting. Also made a slight wording change to the ramp config boxed on the Advanced UI diagram. Thanks to @lowprofile for all corrections. Finally, I incremented the build date to 2023-07-21, although there were no material impacts to the diagrams.
  • 2023-08-06: Several cosmetic fixes to the Simple and Advanced UI diagrams thanks to feed back from @lowprofile. Also incremented the build date to 2023-08-04, although there were no material impacts to the diagrams.
  • 2023-08-07: Several clarifications thanks to feedback from @lowprofile. Also incremented the build date to 2023-08-07, although there were no material impacts to the diagrams.
  • 2023-08-10: Several cosmetic fixes to the Simple and Advanced UI diagrams thanks to feed back from @lowprofile.
  • CapitalLong@lemmy.world
    link
    fedilink
    English
    arrow-up
    4
    ·
    edit-2
    1 year ago

    You did it!

    You know anduril 2 would not be manageable without you at the moment. It’s great that toykeeeper holds a changelog and repo, but without this, I would just have had convoys or something instead.

    Please post the same link on r/flashlights if you haven’t already, just to inform people that there is an update graphicalized, and. That there’s a new Reddit in town! ;)

  • jon_slider@lemmy.world
    link
    fedilink
    English
    arrow-up
    4
    ·
    1 year ago

    Thank you very much! With your new chart, you have succeeded in adding all the features I used to use the manual for.

  • lowprofile@lemmy.world
    link
    fedilink
    English
    arrow-up
    3
    ·
    1 year ago

    Great work, thank you very much! A couple of details I noticed in this detailed diagram (Advanced UI):

    1. If I am not mistaken, for 3C from ON, Change Channel, 50/50 comes before, not after Tint Ramp, so the present order should be corrected.

    2. For the Strobe Modes, Police Strobe and Tactical Strobe should be in the opposite order, as Tactical Strobe comes before Police Strobe.

    3. Furthermore, in Strobe Modes, the Actions could include 3C: Change Channel.

    4. Also, for Lockout Mode, 3H for Change Channel could be added, possibly below 1H and 2H.

    5. Finally, maybe it is useful (if not too much detail) to specify what the two Momentary Floor, 1H and 2H in Lockout Mode, refer to. For 1H it could read Momentary Floor (lowest Floor of Smooth vs Stepped), and for 2H it could read Momentary Floor (highest Floor of Smooth vs Stepped), or Manual Memory if set.

    • containerfan@lemmy.worldOP
      link
      fedilink
      English
      arrow-up
      2
      ·
      1 year ago

      Thanks so much for the feedback. I corrected #1, 2, 3, and 5 in the diagram for the Advanced UI. I can’t get #4 to work on my dual-channel D4V2. It looks like it’s changing channels, but it switches back to the original channel almost immediately. Are you able to get this working on a light? How is it supposed to behave?

      • lowprofile@lemmy.world
        link
        fedilink
        English
        arrow-up
        2
        ·
        1 year ago

        The updated diagram is looking very good, thanks! And yes, I had #4 working just fine, but I checked again, and it is not working with every Anduril 2 version. I do not want to overcomplicate this, but as the Anduril 2 multi-channel branch is in active development, a little extra detail seems to be in order here:

        I am checking this with two D2s (but apparently, so far I only checked 3H in Lockout Mode with the first one of them):

        1. First D2: Running anduril.emisar-2ch-aux.hex by SiteRelEnby, as referred to in this Reddit post (there is also a Lemmy post, but that one does not include the GitHub links added at the top), version 0135-2023-07-03 (new version format).

        2. Second D2: Running anduril.2023-04-25.emisar-2ch.hex from ToyKeeper’s /torches/fsm/anduril2, version 2023-04-26-0135 (old version format); please note: at the same site, also the newer version anduril.2023-05-30.emisar-2ch.hex is available.

        Back to #4: 3H in Lockout Mode for Change channel works with the first D2, but not with the second D2.

        (By the way, the newer Anduril 2 version of the first D2 also added aux LED channels to Change Channel, 3C from ON. This might be another addition to the diagram in the future, adding seven more channels, one each for red, yellow, green, cyan, blue, purple, and white aux LEDs. For example, I disabled all the aux LED channels via 9H from ON, but for the blinky modes, 3C from BattCheck, I set white aux LEDs.)

        As 3H from Lockout to Change channel is in ToyKeeper’s text manual, which is my point of reference, I guess it should also be in the diagram; cf. the UI Reference Table at the end:

        Lockout Any 3H Next channel mode (if more than one enabled)

        And on to #3: Arguably, this should read 3C: Change channel rather than presently 3C: Change channel for strobe modes, as this channel change is not limited to the strobe modes, but extends to ON as well. The same goes for 3H from Lockout, #4, which accordingly should also read Change channel. Both of these only show the enabled channels, not the disabled ones.

        And both of these differ from 3C from BattCheck, which shows all the channels, enabled as well as disabled ones, and which is indeed limited to the blinky modes, so the present addition for blinky modes in Switch channel for blinky modes is correct. Cf. also the (for number blinks only) in the UI Reference Table at the end of ToyKeeper’s text manual:

        Batt check Full 3C Next channel mode (for number blinks only)

        • containerfan@lemmy.worldOP
          link
          fedilink
          English
          arrow-up
          1
          ·
          1 year ago

          Thanks for the continued feedback. I somehow missed 3H from lockout in the text manual the first time around. Even though I can’t get it working properly on my D4V2 at the moment (hex compiled directly from ToyKeeper’s r725 code), I included it. I assume it’ll be fixed soon.

          I also changed the wording slightly for channel switching to be more inline with the text manual, so now it reads “next channel mode” in a few places.

          I’m a little confused about the feature to use 3C to cycle through the aux LED colors. So on my D4V2 which has RGB aux, would 3C turn on, for example, the red aux as the main emitters? For now, I added “Aux LED Channel(s)” to the Next Channel Mode boxes, but I don’t know if that’s appropriate. Take a look, and let me know what you think. Thanks!

          • lowprofile@lemmy.world
            link
            fedilink
            English
            arrow-up
            2
            ·
            1 year ago

            Excellent, and thanks again for your work! This is the only diagram I am aware of that is displaying the (many) new Anduril 2 multi-channel features, and I consider this diagram to be a great contribution to the community.

            As there are so many details to pay attention to, and things can get somewhat confusing, I will go along the individual points. For each of them, I will lay out what the two D2s at my end are doing.

            The first D2 has remained as described above, running anduril.emisar-2ch-aux.hex from SiteRelEnby, version number 0135-2023-07-03.

            The second D2 is now updated to the latest version from ToyKeeper’s site, running anduril.2023-05-30.emisar-2ch.hex, version number 0135-2023-05-30.

            • 3H in Lockout Mode for Next Channel Mode: First D2: working. Second D2: working (but not for the aux LED channels).

            The wording Next Channel Mode looks good to me, also for 3C from ON, and it is in line with the text manual.

            The Aux LED Channel(s) work in the first D2, but not in the second D2. The aux LEDs indeed work as the main emitters in this situation, and as far as I have observed it is ON/OFF with one (high aux) brightness. As to whether to include the Aux LED Channel(s) in the diagram for 3H from Lockout and for 3C from ON, I would suggest: presently No. Although ToyKeeper’s text manual apparently does not specify the channel modes, cf.

            A light can have many different channel modes, so don’t be shy about turning off any modes you don’t use. It makes all the others easier to reach.

            at least for the .hex from ToyKeeper’s site these seem not be included at present, so including them might cause unnecessary confusion. They could simply be added at a later point in time. Then, for consistency, also the Channel Mode Config, 9H from ON, would have to include the aux LED channels (seven, adding up to 12 channel modes).

            • 3C: Next channel mode in Strobe Modes: First D2: working. Second D2: working.

            All fine here (one detail I observed is that the police strobe runs with red and blue aux LEDs in the first D2, but with Channel 1 and 2 in the second D2, just an observation, nothing to be included in the diagram).

            • 3C from Batt Check for Next channel mode (for number blinks only): First D2: working. Second D2: sort of working (?).

            Again, the new wording looks good to me, and it is in line with the text manual. Actually, it is clearer than before, when it referred to the blinky modes rather than the number blinks, as this channel change only applies to Batt Check and to Temp Check, not to Beacon and SOS. Within the Blinky/Utility Modes I had interpreted Blinky to refer to Batt Check and Temp Check, and Utility to refer to Beacon and SOS, but I might have misconstrued that. However that may be, referring to (for number blinks only) in the diagram clears that up.

            The first D2 cycles through all the channel modes, enabled as well as disabled ones, and choosing a channel mode is indeed limited to the number blinks only (and also includes e.g. Version Check, 15C). This is in line with the text manual.

            But with the second D2, 3C from Batt Check works just like 3C from ON, 3C in Strobe Modes and 3H in Lockout Mode, i.e. it only cycles through the enabled channels, and choosing a channel change extends to ON etc. and is not limited to the number blinks only. This is not in line with the text manual.

            In this case, I would suggest to give priority to the text manual and leave the current wording in the diagram as it is.

            • lowprofile@lemmy.world
              link
              fedilink
              English
              arrow-up
              2
              ·
              edit-2
              1 year ago

              PS: With the latest revision 728 from yesterday, 2023-07-10, as far as I can tell, ToyKeeper now integrated the 7 aux LED channel modes into the emisar-2ch build.

              With this, I would now suggest to include the aux LED channel modes in Next Channel Mode, 3C from ON, and leave the present Aux LED Channel(s), or rather Aux LED Channels, in the diagram; there might be no need to individually specify the 7 aux LED channel modes: Red, Yellow, Green, Cyan, Blue, Purple, White.

              And for Channel Mode Config, 9H from ON, to save space by not adding 7 additional points, there could e.g. be one additional point 6+) Release after sixth+ flash and Configure channel 6+.

              Moreover, I noticed a couple of other details in the diagram, and I will post a new comment for those. With all the current additions, I figure it is expected to take a little while to get everything up to speed.

              UPDATE 2023-07-14: I checked with r728 (hex compiled directly from ToyKeeper’s code), and indeed, the 7 aux LED channel modes are now integrated into the emisar-2ch build. One difference I observed compared to SiteRelEnby’s version from above is that the 7 aux LED channel modes are not enabled, but rather disabled by default (which I would have suggested as well).

              • containerfan@lemmy.worldOP
                link
                fedilink
                English
                arrow-up
                1
                ·
                1 year ago

                Yes! It’s working on my D4V2! I updated the Channel Mode Config as you suggested (mostly). I’ll have the updated version posted shortly. Thanks again for the recommendations!

  • lowprofile@lemmy.world
    link
    fedilink
    English
    arrow-up
    3
    ·
    1 year ago

    Here are some additional details:

    1. Advanced UI: In Strobe Modes, Actions, 3C: Next channel mode is not a function for Police Strobe (which makes sense, as Police Strobe uses more than one channel on its own), so it could read 3C: Next channel mode (except Police Strobe).

    2. Advanced UI: In Strobe Modes, Actions, instead of presently 4C: Previous mode, it could read 4C: Previous strobe mode, to clearly distinguish strobe mode from channel mode. This wording would also be in line with the text manual.

    3. Advanced UI: In line with #2, in Strobe Modes, Actions, instead of presently 5C: Momentary for selected mode, it could read 5C: Momentary for selected strobe mode.

    4. Simple UI: As an idea, maybe it would be useful to add two lines of information below (or next to) BattCheck, Line 1: Simple UI: once, cf. text manual, and Line 2: Advanced UI: continuously. This distinction can serve well in determining whether the current UI is Simple UI or Advanced UI, even the more so with the recent developments in hank-cfg.h, where the modified Simple UI now allows ramping toggle as well as aux config and strobe modes.

    • containerfan@lemmy.worldOP
      link
      fedilink
      English
      arrow-up
      1
      ·
      1 year ago

      Fixed all. Might be a little wordy on #4, so let me know what you think. I think it’s a really useful add, and I wanted it to be clear. Thanks!

  • lowprofile@lemmy.world
    link
    fedilink
    English
    arrow-up
    2
    ·
    edit-2
    1 year ago

    Here are some suggestions for Simple UI (multi-channel):

    1. Version Check should be 15+C instead of 15C, consistent with Advanced UI, cf. also the text manual.

    2. Version Check should be in the new format BBPP-YYYY-MM-DD, consistent with Advanced UI.

    3. In the Ramp image, the text should read, from bottom to top, 2H Down / 1H Up, again consistent with Advanced UI.

    4. Toggle Ramp Style, 6C from ON, should be removed, as this is not a Simple UI function in unmodified Anduril 2, cf. the text manual.

    5. 2H from OFF for momentary ceiling should be added, cf. the text manual. 2H from OFF, for consistency with Advanced UI maybe with (momentary), could possibly be added below (or above) 2C from OFF.

    UPDATE 2023-07-22:

    1. 3H from Lockout Mode for Next Channel Mode (3H to cycle) should be added as well, cf. the text manual. So many details to pay attention to … :-)
    • containerfan@lemmy.worldOP
      link
      fedilink
      English
      arrow-up
      1
      ·
      1 year ago

      I had been neglecting the Simple UI diagram apparently. I fixed all points, and rearranged it slightly to make it a tiny bit more compact. Thanks again for all of the corrections.

  • lowprofile@lemmy.world
    link
    fedilink
    English
    arrow-up
    2
    ·
    1 year ago

    Here is a wording suggestion for Advanced UI (multi-channel): For Ramp Extras Config, 10H from ON, as well as for Ramp Config, 10H from OFF (config Simple UI), both Item 4, 2C, maybe it should read if ramped up to ceiling first, or, if that does not fit into the line, if ramped up to ceiling, instead of currently if already at ceiling.

    This would be in line with the text manual, and it would also be more accurate. This is because the brightness will indeed ONLY go up to turbo via 2C if ramped up to ceiling first, not for example if 2C is used to go up to ceiling; in that case, although “at ceiling”, another 2C will go back to the previous brightness level, and not up to Turbo.

  • lowprofile@lemmy.world
    link
    fedilink
    English
    arrow-up
    2
    ·
    1 year ago

    On to something different, this time not for the diagram itself, but rather for the post description: The diagram on BLF referred to is from Lux-Perpetua, not from Lex-Perpetua, so it should read Lux-Perpetua's and Lux's.

    This actually does kind of make sense in this context, as in Latin, “lux” means light, whereas “lex” means law. :-)

    • containerfan@lemmy.worldOP
      link
      fedilink
      English
      arrow-up
      1
      ·
      1 year ago

      OMG, I’m trying to give the guy credit, and I screw up his name. That’s terrible. Fixing it now. Thanks for pointing this out.

  • lowprofile@lemmy.world
    link
    fedilink
    English
    arrow-up
    2
    ·
    1 year ago

    Question for clarification: In the diagrams, are you referring to stock Anduril 2, or rather to e.g. a Hank light or Hank lights?

    For Advanced UI, this has an impact on the Ramp image, specifically for the Turbo style for 2C from ON. Currently, the Advanced UI diagram is displaying Anduril 1 Turbo style, whereas in stock Anduril 2 Turbo style, 2C from ON only goes to Turbo if ramped up to Ceiling first, cf. text manual and ramp-mode.h. Now, for Hank lights, there is hank-cfg.h, which sets Anduril 1 Turbo style as default, and hank-cfg.h is included in multiple cfg-files, for example in cfg-emisar-2ch.h.

    So far, the Turbo style in Advanced UI might just have been a small variation, but this now becomes much more relevant for Simple UI: Some time ago, in rev 691, Extended Simple UI was added to hank-cfg.h. This means that now for Hank lights, Simple UI includes ramp style toggle as well as aux configs and strobe modes. That makes for a quite different Simple UI from stock Anduril 2 Simple UI, based on the text manual, which for example explicitly states that Change ramp style (smooth / stepped), 3C or 6C from ON/Ramp, is for Advanced UI only (Full UI). Currently, the Simple UI (multi-channel) diagram includes Toggle Ramp Style, but not aux configs or strobe modes.

    With this development, cf. for example also wurkkos-cfg.h recently added in rev 731, probably some thought should be given on how to deal with these variations (later on, also the channel modes could vary more from light to light). To keep confusion to a minimum, it might be a useful approach to have diagrams for stock Anduril 2, and possibly branch out from there, maybe with one extra version for Hank (Emisar, Noctigon) lights, or for a specific light that you are using and making the diagrams for? Or to go ahead with just one set of diagrams, and specify what light(s) or model number the diagrams refer to, so everyone knows what the reference base is and that different variations (and defaults anyways) might apply to their own specific light? Or something else?

    • containerfan@lemmy.worldOP
      link
      fedilink
      English
      arrow-up
      1
      ·
      1 year ago

      I can’t remember if I originally developed my first Anduril 2 diagram for a specific light I had (possibly my D4V2), or if the way the turbo works has just evolved over time. Either way, the point of the diagrams is to stay current with unmodified Anduril 2, and I make the source file available so that folks can adapt the diagrams to fit their specific configurations (sorry, only MS Visio for now). So you are correct about turbo, and I updated the Advanced UI diagram to be aligned with the default Anduril 2 style turbo. I’m afraid that if I try to generate multiple diagrams for specific manufacturer configurations then I’ll just fall way behind. Plus, I simply don’t have many of those models. But thank you for pointing this out because it was my intention to represent unmodified Anduril 2.

  • lowprofile@lemmy.world
    link
    fedilink
    English
    arrow-up
    2
    ·
    1 year ago

    Idea for the initial post (showing on top): Maybe it would be useful to also have the diagram (PNG) for Simple UI show up? As far as I can tell, there is one image that can function as a thumbnail at the very top (should probably just stay the Advanced UI PNG, as presently), but maybe in the text below, either the Simple UI PNG or both, Advanced UI PNG and Simple UI PNG, could be displayed (displaying both underneath each other would show them together and make clear that they belong together; and Anduril novices might want to start off with the Simple UI diagram and could see that one right away). This way, the Simple UI diagram would get more and immediate attention as well.

    • containerfan@lemmy.worldOP
      link
      fedilink
      English
      arrow-up
      1
      ·
      1 year ago

      This is going to sound silly, but I didn’t realize that I could post in-line images. I added both per your suggestion, and it’s much more functional. Thanks for getting me to finally look into it!

  • jon_slider@lemmy.world
    link
    fedilink
    English
    arrow-up
    2
    ·
    edit-2
    1 year ago

    I also wanted to be able to keep it up to date

    thanks for all your efforts, very helpful

    fwiw, I just received an Emisar D2 and did a version check that resulted in:

    2021 12 13 0135

    it uses 3H to change channels, not 3C…

    I am trying to learn to reflash the D2 to a later version, but have not figured it out yet. I also dont know which hex file to update to, yet. update, found it: http://toykeeper.net/torches/fsm/anduril2/anduril.2023-04-25.emisar-2ch.hex

    Do you have a flow chart for the existing stock firmware on the D2? (I dont know what revision that would be)

    • containerfan@lemmy.worldOP
      link
      fedilink
      English
      arrow-up
      1
      ·
      edit-2
      1 year ago

      Unfortunately, I have not been keeping historical versions of the diagrams. I checked the file on Dropbox, and it only goes back a month (to a July 9th version of the diagram for r725 which still uses 3C to change channels). Someone once suggested that I use GitHub to track changes for things like this, so I may look into it in the near future.

      I don’t have a D2, but I believe that it uses the same firmware as the D4V2 dual-channel. This would be the latest version from earlier this week (08/07). Once you get on the latest version, my diagrams should apply.