Minor fixes
Changed to cpp and added mergeFiles
Changed switchbox to cpp
changed gpib to cpp
No console params needed in machine
last changes in menu.cpp