make prog and serial port separate

move defines
waps