USB Rechargeable 18350 Convoy S6 Triple

I have been planning a similar mod for a while but haven’t gotten there yet. I laid out a charginging circuit with the components of a commonly available circuit. I have the parts on hand but haven’t worked out how to order the boards.