Added conditional setting of macros according to whether the pic18f4550 or the pic18f4520 is being used