pid.c: converting to jOS.h
pid.c: repaired merge conflicts
pid.c: Converted to new naming convention