Any calibration installed to address a valid drivetrain or emission system complaint is absolutely covered by the warranty(ies). At the very least, the emission system warranty. If a calibration was installed to correct an otherwise warranty covered complaint, then the calibration was covered. Did the calibration installation correct anything you complained about? Did you ask for it, not related to a valid complaint? If not, they're still on the hook for it.