adding a switch condition
Removing unneeded includes in the ino main file
Correct naming
Improvement class
condition fix