Commit graph

144 commits

Author SHA1 Message Date
Mikael Degerfält
6c721e8b65 Removed code duplication
Also fixed bug were I reset the active sub menu when then sleep timer kicks in.
2019-06-23 17:14:18 +02:00
Mikael Degerfält
65aa0f4dab Converted more of the sub menus to the new sub definitions
Found out that it’s the lambda functions used for pointer that forces the structs to be in ram instead or rom.
2019-06-23 17:14:18 +02:00
Mikael Degerfält
699546df8c Handle sub menus in a generic way and moved adjust menu logic to separate file
This is a big one where I can finally reap what I sown. Sub menu entries now provide two functions, one to get the text for the current value and one to apply changes aka save to EEPROM. With this I can replace so much code in the menu() function that handles input, but was _almost_ identical. The process of converting the old menus are not completed, and I can probably remove about 200 lines more code.

The question is still what to do with less general menus like the rotator and fast patch menu.

One problem with the current implementation is that it is RAM heavy. It seems the const MenuEntry structs are placed in ram, because there is a pointer to RAM that I assume is allocated during execution and therefore the address cannot be stored in ROM.

My plan has been to put all the configuration fields (that are stored in EEPROM) into a struct or an array. When that is implemented, I can instead store the offset into the array in the const struct, which should be available at compile time and therefore can reside completely in ROM.
2019-06-23 17:14:17 +02:00
Mikael Degerfält
ca5b2b9484 Removed unnecessary display.display() call 2019-06-23 17:14:17 +02:00
Mikael Degerfält
3df78f6598 Same as before 2019-06-23 17:14:17 +02:00
Mikael Degerfält
3de5dd2b37 Even more places to use helper functions 2019-06-23 17:14:17 +02:00
Mikael Degerfält
aec3ef9fc7 Use helper function to plot velocity 2019-06-23 17:14:17 +02:00
Mikael Degerfält
b156a5935d Moved status led blink to function 2019-06-23 17:14:17 +02:00
Mikael Degerfält
f2eabd7d37 Minor cleanups 2019-06-23 17:14:17 +02:00
Mikael Degerfält
1ac1b67732 Small bug fix 2019-06-23 17:14:17 +02:00
Mikael Degerfält
6e0786bccb Missed a few spots for sub menu redraw 2019-06-23 17:14:17 +02:00
Mikael Degerfält
8087f93677 Use helper function for midi channel as well 2019-06-23 17:14:17 +02:00
Mikael Degerfält
8772e28907 Pass button state instead of accessing global variable 2019-06-23 17:14:17 +02:00
Mikael Degerfält
2ed201ed04 Helper function to draw centered number in sub box 2019-06-23 17:14:17 +02:00
Mikael Degerfält
0c7bb7cc13 Pass *currentPage to functions instead of the original page data
This way it will be easier to break out even more functionality into more general functions.
2019-06-23 17:14:17 +02:00
Mikael Degerfält
5aafab684e Unified sub menu redraw 2019-06-23 17:14:17 +02:00
Mikael Degerfält
2ea76d96d3 Unified sub menu cursor blink 2019-06-23 17:14:17 +02:00
Mikael Degerfält
bd84f16b1a Removed an unused function 2019-06-23 17:14:17 +02:00
Mikael Degerfält
4c4d0e8b5a Unified main and patch menu input handling
Now all menu pages are handled the same way, which is great because now I can implement scrolling in the menu pages.
2019-06-23 17:14:17 +02:00
Mikael Degerfält
0d0ea5051d Made the sensor adjust menu driven by data
* Moved menu titles and option names into data structures.
 * Unified select menu option code
 * Also unified handling of menu selection, although main and rotator menus are still handled the old way.
 * Moved struct definitions to numenu.h
 * Grouped functions and variables together based on usage.
2019-06-23 17:14:17 +02:00
Mikael Degerfält
9a0bb369ac Menu selection is now data driven
Some major refactoring has been going on.
Added simple structs of data containing info about what action to take when a menu item is selected.

Finally removed all but one call to display.display() in menu-function. There might still be more than one call to it on a frame though, since some functions still calls it internally.
2019-06-23 17:14:17 +02:00
Mikael Degerfält
6a8e36635e Avoid calling display.display() twice in an update.
Moved functions around to have a better overview of draw function. This will make it easier for me to continue with the next part, which probably will be a more generic handling of menus.
2019-06-23 17:14:17 +02:00
Mikael Degerfält
2f5c546b2c Two unrelated changes
* Move text print of submenu into function
 * No need to check if value changed since writeSettings uses EEPROM.update.
2019-06-23 17:14:17 +02:00
Mikael Degerfält
e362546e3c First iteration of menu cleanup
* Broke up the code into more general functions instead of duplicating code
 * Made stuff const and removed variables no longer used
 * Use defines for menu button values
 * Changed the order or things to avoid forward declarations
 * Use array lookup instead of switch-case on some menu options
 * Adjust menu functionification
 * Cleaned up sensor rendering
2019-06-23 17:14:17 +02:00
Mikael Degerfält
435ad106d8
Merge pull request #14 from blind/sim
Use keys 1-7 for valve and trills
2019-06-23 17:07:31 +02:00
Mikael Degerfält
8723bb8706 Merge branch 'master' into sim 2019-06-23 17:01:16 +02:00
John Stäck
3d0e2cf719 Let imgui submodule be untracked without whining 2019-06-23 15:58:54 +02:00
John Stäck
095dacdf7f
Merge pull request #13 from Trasselfrisyr/midisim
Deeper MIDI simulation
2019-06-23 15:52:54 +02:00
John Stäck
98acd6067f
Merge pull request #12 from blind/initial-settings-bug
Write new factory constants even if old version was < 24
2019-06-23 15:51:27 +02:00
John Stäck
2332f37eca Advanced unusage of parameters 2019-06-23 14:51:31 +02:00
John Stäck
3d38f50d98 Add deeper simulation of USB midi 2019-06-23 14:30:32 +02:00
Mikael Degerfält
315013eb2b Updated readme 2019-06-23 13:34:19 +02:00
Mikael Degerfält
e46378f1a3 Merge branch 'master' into sim 2019-06-23 11:41:11 +02:00
Mikael Degerfält
3445c79f23 Press buttons 1-7 for valves and trills and left index input
Also moved bug workaround code to be in the same function for simpler removal at later stage.
2019-06-23 11:38:39 +02:00
Mikael Degerfält
25a31d8df8 Write new factor constants even if old version was < 24
This bug would probably never happen in real life, and could be fix by holding down menu and enter buttons at startup. But a bug is a bug.
The only reason I found this bug is that the simulator didn’t initialise EEPROM to 0xff, and even after I did that it crashed, because a version of 0xffff wasn't handled.
2019-06-23 10:24:42 +02:00
John Stäck
2d034b6369 C++ify midi.ino, change to appropriate datatypes 2019-06-23 09:55:51 +02:00
John Stäck
9777184429
Merge pull request #11 from blind/sim
Simple simulation code
2019-06-23 08:52:33 +02:00
Mikael Degerfält
0f8c0ff77e Don't spam digital write output 2019-06-22 23:10:26 +02:00
Mikael Degerfält
d9b18255e5 Initialize touch inputs to untouched 2019-06-22 23:10:03 +02:00
Mikael Degerfält
09a35aa1d9 Added flag to build for release, also set rpath for app bundle 2019-06-22 23:08:39 +02:00
Mikael Degerfält
d564e1b434
Fixed spelling 2019-06-21 18:59:21 +02:00
Mikael Degerfält
5596e0901d Added info on how to get the required submodules 2019-06-21 18:54:25 +02:00
Mikael Degerfält
f900be5306 More globals in UI + workaround for bug in firmware
A bug in the current NuEVI.ino does not write all default values to EEPROM on the first boot, unless menu + enter buttons are pressed. I added a workaround to the simulator that fakes that the buttons are pressed when calling the setup function.
2019-06-21 18:40:07 +02:00
Mikael Degerfält
9357d4b827 More inputs and outputs added in simulator
* Set default value for battery sensor input
 * Show EEPROM values as unsigned.
 * Simulate K1 to K7 inputs (valve and trills++)
2019-06-21 18:13:02 +02:00
Mikael Degerfält
0871b2582d Simulator now uses ImGui for stuff 2019-06-21 18:08:24 +02:00
Mikael Degerfält
1be998153a Fake input and bug fixes
* Press W in simulator to activate (pretty slow shit, do avoid unless compiling with optimisations)
 * Tiny improvement of the EEPROM simulation.
 * Fixed type typo for millis and micros
2019-06-21 18:07:47 +02:00
Mikael Degerfält
266b3334cb Simple simulation code
Builds a native program on MacOS that runs the NuEVI firmware compiled for x86_64.
Only input is arrow keys for menu buttons for now. Only output is console and display.

Copied some more library files into the simulation folder, and renamed the modified *.cpp files from the libraries to *_sim.cpp.
2019-06-13 20:51:45 +02:00
John Stäck
c9123b746f
Merge pull request #10 from blind/memory-save
Save memory by changing int arrays to const short arrays
2019-06-11 23:20:01 +02:00
Mikael Degerfält
c43be09b1f Save memory by changing int arrays to const short arrays
No need to have them in RAM since they are never changed, and their value was never higher than 14 bits, so using 32 was just a waste.
2019-06-09 16:53:17 +02:00
John Stäck
8581738b40
Merge pull request #8 from blind/global-cleanup
Global namespace cleanup
2019-06-09 11:48:07 +02:00