I'm working on a project for school where we must generate a square and triangle wave from fixed supplies in a lab using only RC components as well as a specific list of active components:

We are also NOT allowed to use variable capacitors or ganged potentiometers.
The circuit must have frequency adjustment (with a max of over 55KHz) as well as amplitude adjustment (The amplitude adjustment I'm not worried about, as I will just put each signal through an inverting amplifier and use pots for the feedback resistors. As you can see, I haven't gotten around to this yet).
This is my current circuit:

My obvious problem lies in the frequency adjustment. I can adjust the frequency of the oscillations with pot1, however, if I do, the bias required to remove the offset on the integrator changes and therefor, I need to somehow be able to adjust this bias in unison with pot1 to keep the triangle wave centered.
I'm wondering if someone could shed some light on possible solutions to look into. I've spent some time going through forums for possible solutions with little luck. Maybe I'm going about this wrong. Once again, we aren't allowed to use ganged pots. I picked the NE5534 because it gave me a nice square wave past 55KHz. As for the LM813, I don't have a specific reason for choosing. apart from it being in the list and its PSpice model seeming to work well for the application.
Thanks.

We are also NOT allowed to use variable capacitors or ganged potentiometers.
The circuit must have frequency adjustment (with a max of over 55KHz) as well as amplitude adjustment (The amplitude adjustment I'm not worried about, as I will just put each signal through an inverting amplifier and use pots for the feedback resistors. As you can see, I haven't gotten around to this yet).
This is my current circuit:

My obvious problem lies in the frequency adjustment. I can adjust the frequency of the oscillations with pot1, however, if I do, the bias required to remove the offset on the integrator changes and therefor, I need to somehow be able to adjust this bias in unison with pot1 to keep the triangle wave centered.
I'm wondering if someone could shed some light on possible solutions to look into. I've spent some time going through forums for possible solutions with little luck. Maybe I'm going about this wrong. Once again, we aren't allowed to use ganged pots. I picked the NE5534 because it gave me a nice square wave past 55KHz. As for the LM813, I don't have a specific reason for choosing. apart from it being in the list and its PSpice model seeming to work well for the application.
Thanks.