Enclosed constant def in brackets to prevent bugs
Removed slave query from IDN now slaveIdnTest() is working
Reordered scpi_ members for size and alphabetically