Changed protocol_id lookup and use for graphing, added macro_id to overwrite settings from protocol_id, allowing console input to use macros