Does the Calvin cycle return ADP Pand NADP to the light reactions?

Yes, It transfers them back; it is a continuous cycle.