Commit graph

109 commits

Author SHA1 Message Date
Mikael Degerfält
b061084f1f Fixed som redraw issues 2019-06-24 17:55:37 +02:00
John Stäck
6c1c5e0344 More explicit version checking 2019-06-24 15:39:13 +02:00
John Stäck
b6ed8126b7 Allow midi+serial usb type too (useful for "console debugging") 2019-06-24 15:38:29 +02:00
John Stäck
d04c0f92f8 Use TEENSYDUINO to determine version rather than making our own 2019-06-24 15:00:42 +02:00
John Stäck
50b1fe9eb3 Check for correct target platform and USB type 2019-06-24 15:00:00 +02:00
Mikael Degerfält
91b2a69d21 Fixed text alignment for sub values with units 2019-06-24 00:17:27 +02:00
Mikael Degerfält
d2f3bba544 Reduced code duplication and fixed adjust cursor bug 2019-06-23 22:02:23 +02:00
Mikael Degerfält
e08a3a5291 Converted lambdas to normal functions to save RAM 2019-06-23 22:01:17 +02:00
Mikael Degerfält
9561556302 No need to set text color all the time
Since the cursor blinking is handled a bit differently now, there is no need to set text color all the time since we know it should always be white. But just to be certain, lets set it to WHITE first thing in the updatePage function.
Also moved the code from plotMIDI into a custom render function for midi sub menu.
2019-06-23 21:28:35 +02:00
Mikael Degerfält
7a2b70c38d Moved code from a function into where it was called
and some minor cleanup
2019-06-23 21:02:08 +02:00
Mikael Degerfält
5b59b4cd0f Final push to unify all menu states
All states are now handled by the new menu system, although some are flagged to have a custom handler that does everything by itself.

I replaced most reference parameters to pointers to be able to typecast in a nicer way.

Key input is not passed as a parameter to the menu functions instead of having global variables they all access. I think I broke one thing by doing this, since there is no way to propagate key input changes to the next frame.
2019-06-23 17:14:18 +02:00
Mikael Degerfält
9a595c0ffc WIP on making menues even more generic in handling 2019-06-23 17:14:18 +02:00
Mikael Degerfält
be0d08d8d6 Renamed some stuff for clarity 2019-06-23 17:14:18 +02:00
Mikael Degerfält
f2e2b7d33f Tiny adjust menu redraw bug fix
Had forgotten to redraw adjust menu after normal update, it was only redrawn when the sensor pixels were to be updated.
As a bonus I cleaned up some code.
2019-06-23 17:14:18 +02:00
Mikael Degerfält
bddbffd51d Moved over the rotation menu to new system
Had to change how the values where stored in RAM from singed to unsigned to be able to use the generic menu features. Also had to add the MenuEntrySub as a parameter to the menu callback functions to be able fo display and store the correct values.

Did some major cleanup now that the special case of rotator menu is gone together with all uses of the old version of the sub menu struct.
2019-06-23 17:14:18 +02:00
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
John Stäck
095dacdf7f
Merge pull request #13 from Trasselfrisyr/midisim
Deeper MIDI simulation
2019-06-23 15:52:54 +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
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
Mikael Degerfält
cc3323fd03 Move access to usbMIDI to midi.ino
NuEVI.ino shouldn’t have to know about usbMIDI.
2019-06-08 22:22:13 +02:00
Mikael Degerfält
921fdb1266 Global namespace cleanup
Moved variables only used in menu to menu code. Variables only used in NuEVI.ino removed from globals.h and made static.
2019-06-08 15:34:16 +02:00
Mikael Degerfält
2c4fd26d25 Fix problem where the V was still visible if battery low 2019-06-07 23:57:17 +02:00
Mikael Degerfält
883dbf605e Avoid converting value to a double
No need to convert a value to double when all we want is a two digits converted to string.
This also avoids linking some math library, which saved almost 8K och program storage space.
2019-06-07 00:12:06 +02:00
Mikael Degerfält
58ea673994 Moved settings #defines to settings.h
I did feel like they belong in config.h
2019-06-04 23:34:26 +02:00
Mikael Degerfält
4bf2a3a91e Renamed menu.ino to menu.cpp
This change required lots of other changes to have it compile. I had to declare all variables from NuEVI.ino used by the menu as extern in a separate header file (globals.h).
Also I moved all defines from NuEVI.ino to a config.h file. I think some of these could be moved back or even moved into menu.cpp.
I declared many variables and functions in menu.cpp as static and moved them around to avoid forward declarations. For simplicity I did some forward declarations anyway.
Some varibles only used in menu.cpp was moved from NuEVI.ino instead of having them as externals.
2019-06-03 19:24:21 +02:00
Johan Berglund
f0010cb08c Support for CV box/CV board (compile option). Match idle CV from PWM breath CV on A6 to direct output idle voltage from breath sensor (so any of them can be used for CV box without need for recalibration of box). Added reading and ignoring incoming USB MIDI messages to prevent buffers from getting filled up blocking outgoing messages. 2019-05-25 11:05:17 +02:00