Extended the macro system to remove difference between xbee S1 and S2