Doubt the Ryobi One+ packs will fit or work as the contacts are on the exterior of the battery post and are a different shape. A local battery shop here (Battery Wholesale) will rebuild these packs for about 2/3s the cost of a new pack with a one year warranty. I've had Makita 12 volt stick packs, Hilti 9.6 volt packs, and Ryobi 18 volt packs rebuilt by them with great success. I see no reason that the DeWalt packs can't be rebuilt also.