Thanks trakcon for link
Youāre welcome!
Thank you Toykeeper!
Just got my sc31Pro. First Andruil flashlight. This is really nice work and I appreciate it! Makes what was (e.g. the SC31B) a good light into an EXCELLENT light! Bravo! Thought the driver you did for the silver convoy C8 was a very nice improvement over the drivers that were available in budget C8s of the day. This is so much better!
Is this in its final stage? I didnāt read through ALL the pages so I apologize if itās been mentioned
Those are really interesting ideas and Iāll have to try them sometimeā¦ but for now I might stick with the old menu UI. Most menus only have 1 item, and the longest one is only 3. However, the suggested design would probably reduce code size a bit, and would encourage moving menus from āCā to āHā shortcutsā¦ so it might be a good option. It could also give the user a way to enter a zero in a menu, without sacrificing the ability to skip a setting.
The two-stage āHā actions are interesting too, for fitting 3 options into 2 button mappingsā¦ It could be used for the the manual/automatic/hybrid memory settings. I donāt see anywhere else it would be applicable though.
Before hybrid mem, it was:
- 10C: Manual mem (and save current brightness)
- 10H: Automatic mem
While adding hybrid mem, I changed it to:
- 10C: Toggle manual/automatic memory (and save current brightness when enabling manual mem)
- 10H: Configure hybrid memory timeout (menu)
But it might be nice to change it to this:
- 10C: Manual mem (and save current brightness)
- 10H (short): Automatic mem
- 10H (long): Configure hybrid memory timeout (menu)
Changing it to use short/long holds (with a blink at each stage) would increase the code size a bit and introduce a new UI style which is only used in one place, but it might be worth the cost.
Itās not really a formal processā¦ I work on it sometimes when I can. Was hoping to have it finished and merged six weeks ago, but life has been weird.
Iāve also been a bit reluctant to merge early, since itās a major change so it probably needs a lot of testing. Also because new ideas keep coming up and itāll be a lot easier to add them now instead of later.
I tried building Anduril2, no changes, just defaults using cfg-blf-g8.h. It's saying overflowed text region by 110 bytes. Anyone else tried to build it?
I certainly could be doing something wrong.
TK - also wondering how you are adding features and not taking things away?
I'm using AtmelStudio 7 (of course - I do Windows ) which I've used successfully before to build Anduril.
110 bytes is darn close, so I'm thinking I'm close. I'll try taking away some functionalities.
Ooops, update: building with cfg-emisar-d4 worked!! 7934 bytes used in Program Memory!!! No AUX LED support did the trick, I'm sure.
Ok, now that I can dnld it, worth giv'n it a go? I gotta read up on it more - my head is spin'n... I got a E3/E3S board ready to go:
So to test Anduril2 with switch LED support on a ATTiny85 FET+1, I decided to try it on a modded Nitenumen TK35 first. The TK35 has extra long LED wires so I can re-program easily. I disabled Beacon Mode (#undef USE_BEACON_MODE) to free up enough code space to fit in under 8 KB. So far it's working well, as documented anduril-manual.txt.
Yes, the Simple UI is simple...
Couple things though:
- In Simple UI, the battery check works only once instead of running continuously. I didn't expect that but probably as designed
- Thought I set the version # to "11", it's blinking a whole lot more than that. Not sure what it's doing.
It blinks the model as well. This is a feature recently added to see which firmware is used on which flashlight by the manufacturers.
Good idea! There's lots of blind copying goin on.
I've been doing further testing (and minor modding) Anduril2 on the TK-35 light.
If I enabled START_AT_MEMORIZED_LEVEL, I ran out of code space again, so undef'ed USE_SUNSET_TIMER and that brought it down once again.
I also added a USE_2C_MAX_TURBO setting. What this setting does is always have the 2C go to max turbo, not max ceiling. But for Simple UI, works as it did before.
Modded code snippet in ramp-mode.c below.
TK: Not sure if you want to use it, but if you do, you have my permission:
// 2 clicks: go to/from highest level
else if (event == EV_2clicks) {
// simple UI: to/from ceiling
// full UI: to/from ceiling if mem < ceiling,
// or to/from turbo if mem >= ceiling
uint8_t turbo_level;
// TE 2020-09-18: Add compile switch for Making 2C the max
#ifdef USE_2C_MAX_TURBO
turbo_level = MAX_LEVEL;
#ifdef USE_SIMPLE_UI
if (simple_ui_active)
turbo_level = mode_max;
#endif
#else
if ((memorized_level < mode_max)
#ifdef USE_SIMPLE_UI
|| simple_ui_active
#endif
) { turbo_level = mode_max; }
else { turbo_level = MAX_LEVEL; }
#endif
if (actual_level < turbo_level) {
// true turbo, not the mode-specific ceiling
set_level_and_therm_target(turbo_level);
}
else {
set_level_and_therm_target(memorized_level);
}
#ifdef USE_SUNSET_TIMER
timer_orig_level = actual_level;
#endif
return MISCHIEF_MANAGED;
}</code></pre>
I have not tested it yet - will do so tomorrow.
This is the section of the cfg file I've added:
//---------------------------------------------------------------------------------------------
// TE - changes:
//---------------------------------------------------------------------------------------------
#undef DEFAULT_THERM_CEIL
#define DEFAULT_THERM_CEIL 60 // from 45 -> 60
#define MAX_THERM_CEIL 90 // from 70 -> 90
#define USE_2C_MAX_TURBO
// TE 2020-09-18" Take away Beacon and Sunset Timer to get the code down under 8 KB!!
#undef USE_BEACON_MODE
#undef USE_SUNSET_TIMER
// For the TK-35, enable this!
#define START_AT_MEMORIZED_LEVEL
If you can find the right place to put it, the -fwhole-program
flag might help. That tells it to skip all the steps which enable linking multiple object files together, and instead assume the program consists of only one .c file. Iāve written FSM and Anduril in a weird way which makes that possible, and it saves a few hundred bytes on top of the other optimization settings.
This should get the Emisar D4 (v1) build down to about 7758 bytes in the default configuration. For blf-q8, Iām getting 8110 bytes.
Or maybe itās due to some of the other flags. Hereās my build process:
> make
...
===== emisar-d4 =====
../../../bin/build.sh 85 anduril -DCONFIGFILE=cfg-emisar-d4.h
avr-gcc -DCONFIGFILE=cfg-emisar-d4.h -Wall -g -Os -mmcu=attiny85 -c -std=gnu99 -fgnu89-inline -fwhole-program -DATTINY=85 -I.. -I../.. -I../../.. -fshort-enums -o anduril.o -c anduril.c
avr-gcc -Wall -g -Os -mmcu=attiny85 -fgnu89-inline -o anduril.elf anduril.o
avr-objcopy --set-section-flags=.eeprom=alloc,load --change-section-lma .eeprom=0 --no-change-warnings -O ihex anduril.elf anduril.hex
Program: 7758 bytes (94.7% Full)
Data: 196 bytes (38.3% Full)
But yeah, itās definitely getting closer and closer to the point where no more can be added without overflowing. On some build targets, Iāve already had to start removing things. (mostly just MF01-Mini and ROT66)
Iām considering a major change to how the menu system works, to reduce code size and to change the interface style. Instead of waiting through each option to time out before moving on to the next, it would let the user skip directly to the desired option. Basically, just hold the button until it blinks N times, to access option number N, then let go to trigger the numeric entry prompt. The downside, is that it would only allow changing one option per invocationā¦ and would require people to re-learn part of the UI.
Yes, in simple mode itās meant to blink out once and then exit. People donāt like getting stuck in ādisco modesā (*), so it makes sure exit on its own.
However, Iām not incredibly happy with how battcheck and version check work in one-time mode (where they blink out once and then exit). Thereās a bug which can sometimes eat the next button press afterward, and itās a very difficult bug to fix since itās deep in the state-change mechanisms. Basically, state changes are instantaneousā¦ but they need to be put in a queue for later handling. This timing discrepancy can cause some problems depending on how the program is written, and the fix is rather a pain to implement and would increase the program size significantly. So for now, it just eats a button press sometimes after version check ends.
Anyway, about the version numbers, it recently changed to a new format:
- YYYYMMDDBBPP
- YYYYMMDD: Year/month/day the program was compiled, or whatever
version.h
has in it. - BBPP: 4-digit brand / product model code, specified in
cfg-*.h
. A list of brands is in theMODELS
file.
- YYYYMMDD: Year/month/day the program was compiled, or whatever
The model number serves a couple purposes. For one, it lets people know exactly which build and which configuration their light usesā¦ even if the firmware was copied from another light. This has been happening a lot lately. It also makes it easy to detect when a company reuses code from another light, vs when they create new firmware customized for that specific model. Like, itāll be easy to tell when Astrolux uses code built for an Emisar product, for example. Or when a D1 ships with a D4v2 tiny1634 driver instead of the older D1 tiny85 driver.
The make models
command produces a list of all known model numbers. At the moment, this is what it says:
> make models
Model numbers:
0111 emisar-d4
0112 emisar-d4-219c
0113 emisar-d4v2
0114 emisar-d4v2-219
0115 emisar-d4v2-nofet
0121 emisar-d1
0122 emisar-d1s
0123 emisar-d1v2
0131 emisar-d4s
0132 emisar-d4s-219c
0133 emisar-d4sv2
0134 emisar-d4sv2-219
0141 emisar-d18
0211 noctigon-kr4
0212 noctigon-kr4-nofet
0213 noctigon-kr4-219
0251 noctigon-k1
0252 noctigon-k1-sbt90
0253 noctigon-k1-12v
0311 fw3a
0312 fw3a-219
0313 fw3a-nofet
0321 blf-gt
0322 blf-gt-mini
0411 ff-rot66
0412 ff-rot66-219
0413 ff-rot66g2
0421 ff-pl47
0422 ff-pl47-219
0423 ff-pl47g2
0441 ff-e01
0511 mateminco-mf01s
0521 mateminco-mf01-mini
0611 blf-q8
0612 sofirn-sp36
0621 blf-lantern
Duplicates:
Missing:
* As of a few days ago, there is actually a mode called ādiscoā mode. It flashes the RGB aux LEDs in random patterns at a high speed, and is an option for use during Off mode or Lockout mode.
Thanks, I added that as a compile-time option. By default itās turned off, but can be enabled per build target or in config-default.h
to affect all build targets.
Turning it on saves 4 bytes and reverts āRamp 2Cā back to how it behaved in Anduril 1.
There is also an āOff 2Hā action to access momentary turbo (or momentary ceiling in simple mode). This has changed from the old behavior of āOff 2Hā being a shortcut to āceiling, then ramp down if heldā.
I really like the candle-mode, but most times it is too ānervousā- the flickering rate is high for me. Is ist possible to implement an adjustable āframerateā? So brightness & flickering could be matched to the situation. I would love the possibility : ) The lightning mode could also benefit from this (okay, in this case only the pauses should be shortened/extended).
Will it be possible to update old drivers? I canāt relly get, what āit would break backward compatibilityā means.
- Christian
The intensity of candle mode can be configured at compile time by setting CANDLE_AMPLITUDE to a different value. The default is 25. It controls the difference between the dimmest and brightest parts of the animation. With lower values, it makes the individual steps easier to see, so it looks less smooth. With higher values, itās more smooth but flickers too intensely like itās a camp fire instead of a candle.
At some point, Iām hoping to increase the frame rate and/or make it use intermediate steps between the ~25 ramp levels it uses, to make it look more smooth without increasing the intensity. However, this is ā¦ tricky.
Old drivers can be updated, but it depends on the type of light. Some are easy, some require soldering to access the right parts, and some are glued so thoroughly theyāre nearly impossible to open.
Sounds good! TK - pm'ed you with a question. Need to re-sync locally from 559 to 561.
Need to re-sync locally from 559 to 561.
Usually a ābzr pullā or ābrz pullā should do the trickā¦ if you downloaded it with a ābzr branchā originally and havenāt modified any of the files it tracks.
If modified, then youād have to commit your changes and then ābzr mergeā to get the things which changed. And if you changed the same parts I did, itāll have merge conflicts. So usually I keep one copy to mirror whatās upstream, and another copy that I can work in.
Hhmm, don't know the bazaar commands, after all, they are bazaar
I just dnld. All I'm doing at this point is creating and modding cfg files. Also modded anduril.c to load the cfg file I want to use.
Been using git at work and recently just recently did branch and merges, but we use tortoise git as the git UI.
I'm not seeing much right now that I want to change - you've been adding most things I wanted, like voltage calibration.
I created a running list of possible future mods and this is what it looks like now:
- UI config to drop thermal regulation altogether
- For Off 3X clicks: BattCheck -> TempCheck -> Version# (like the old Narsil). Still think this would go well together in Anduril.
- UI config or compile switch for 2C from OFF to set max turbo instead of top of ramp
Beacon mode can be dropped now, and that I had as a custom mod before.
A bigger change would be to support 2 e-switches but that might have to be done as a different SM UI, think as you mentioned before. I got a couple 2 e-switch lights to mod but would need the driver support as well, though could wire up a modded driver.