- 04 Jan, 2023 1 commit
-
-
Marc Killpack authored
overwritten by Dr. Beard flattening the folder structure. Changes to be committed: modified: _A_arm/python/hw15/armParamHW15.py modified: _A_arm/python/hw16/armParamHW16.py
-
- 29 Nov, 2022 1 commit
-
-
Marc Killpack authored
Changes to be committed: modified: _A_arm/python/hw13/armParamHW13.py deleted: _A_arm/python/hw16/armFreqInputSim.py
-
- 28 Nov, 2022 1 commit
-
-
Marc Killpack authored
with homework problems in book, or add "digital_filter" for pendulum case study. Case study B (cart pendulum) works for digital filter now, but not state space. Not sure why. Changes to be committed: modified: _A_arm/python/hw11/armController.py modified: _A_arm/python/hw11/armParamHW11.py modified: _A_arm/python/hw11_armSim.py modified: _A_arm/python/hw7/armController.py modified: _B_pendulum/python/hw10_pendulumSim.py modified: _B_pendulum/python/hw11/pendulumParamHW11.py modified: _B_pendulum/python/hw18/pendulumController.py modified: _B_pendulum/python/hw18_pendulumSim.py modified: _B_pendulum/python/hw8/pendulumParamHW8.py modified: _C_satellite/python/hw11/satelliteParamHW11.py modified: _C_satellite/python/hw18/satelliteController.py modified: _C_satellite/python/hw18_satelliteSim.py
-
- 05 Oct, 2022 1 commit
-
-
Marc Killpack authored
Changes to be committed: modified: _B_pendulum/python/pendulumParam.py
-
- 04 Oct, 2022 2 commits
-
-
Marc Killpack authored
Changes to be committed: modified: _B_pendulum/python/hw08_pendulumSim.py modified: _B_pendulum/python/hw8/pendulumController.py modified: _B_pendulum/python/hw8/pendulumParamHW8.py
-
Marc Killpack authored
better. And to try and clarify some points that may be confusing for students. Changes to be committed: modified: _A_arm/python/hw02_armSim.py modified: _A_arm/python/hw7/armParamHW7.py modified: _A_arm/python/hw8/armParamHW8.py modified: _C_satellite/python/hw08_satelliteSim.py modified: _C_satellite/python/hw8/satelliteController.py modified: _C_satellite/python/hw8/satelliteParamHW8.py modified: _C_satellite/python/satelliteParam.py
-
- 18 Sep, 2022 1 commit
-
-
Marc Killpack authored
their dynamics for at least one input. Changes to be committed: new file: _D_mass/python/test_dynamics.py new file: _E_blockbeam/python/test_dynamics.py new file: _F_planar_vtol/python/test_dynamics.py
-
- 06 Sep, 2022 1 commit
-
-
Marc Killpack authored
to make them better match the book and the example case studies. Changes to be committed: modified: ../../_D_mass/python/hw13/dataPlotterObserver.py modified: ../../_D_mass/python/hw2/dataPlotter.py modified: ../../_D_mass/python/hw2/massAnimation.py modified: ../../_D_mass/python/massParam.py renamed: ../../_E_ballbeam/python/ballbeamParam.py -> ../../_E_blockbeam/python/blockbeamParam.py renamed: ../../_E_ballbeam/python/hw13/dataPlotterObserver.py -> ../../_E_blockbeam/python/hw13/dataPlotterObserver.py renamed: ../../_E_ballbeam/python/hw2/ballbeamAnimation.py -> ../../_E_blockbeam/python/hw2/blockbeamAnimation.py renamed: ../../_E_ballbeam/python/hw2/dataPlotter.py -> ../../_E_blockbeam/python/hw2/dataPlotter.py renamed: ../../_E_ballbeam/python/hw2/signalGenerator.py -> ../../_E_blockbeam/python/hw2/signalGenerator.py modified: VTOLParam.py modified: hw13/dataPlotterObserver.py modified: h...
-
- 30 Aug, 2022 3 commits
-
-
Marc Killpack authored
Changes to be committed: modified: _A_arm/python/hw12/armController.py modified: _A_arm/python/hw12/armParamHW12.py modified: _A_arm/python/hw12_armSim.py
-
Marc Killpack authored
numpy arrays. Also, tried to just fix some dimensioning that we had cobbled together for a while. I'm sure there's still things to improve relative to this though. Changes to be committed: modified: _A_arm/python/hw18/armController.py modified: _B_pendulum/python/hw10/pendulumController.py modified: _B_pendulum/python/hw11/pendulumController.py modified: _B_pendulum/python/hw12/pendulumController.py modified: _B_pendulum/python/hw12/pendulumParamHW12.py modified: _B_pendulum/python/hw13/dataPlotterObserver.py modified: _B_pendulum/python/hw13/pendulumController.py modified: _B_pendulum/python/hw13/pendulumParamHW13.py modified: _B_pendulum/python/hw14/pendulumController.py modified: _B_pendulum/python/hw14/pendulumParamHW14.py modified: _B_pendulum/python/hw18/pendulumController.py modified: _B_pendulum/python/hw18/pendulumLoopShapingOuter.py modified: _B_pendulum/python/hw18_pendulumSim.py modified: _B_pendulum/python/hw2/dataPlotter.py modified: _B_pendulum/python/hw2/pendulumAnimation.py modified: _B_pendulum/python/hw3/pendulumDynamics.py modified: _B_pendulum/python/hw8/pendulumController.py modified: _C_satellite/python/hw10/satelliteController.py modified: _C_satellite/python/hw11/satelliteController.py modified: _C_satellite/python/hw12/satelliteController.py modified: _C_satellite/python/hw12/satelliteParamHW12.py modified: _C_satellite/python/hw13/dataPlotterObserver.py modified: _C_satellite/python/hw13/satelliteController.py modified: _C_satellite/python/hw13/satelliteParamHW13.py modified: _C_satellite/python/hw14/satelliteController.py modified: _C_satellite/python/hw14/satelliteParamHW14.py modified: _C_satellite/python/hw18/satelliteController.py modified: _C_satellite/python/hw18_satelliteSim.py modified: _C_satellite/python/hw2/dataPlotter.py modified: _C_satellite/python/hw2/satelliteAnimation.py modified: _C_satellite/python/hw3/satelliteDynamics.py modified: _C_satellite/python/hw8/satelliteController.py modified: _C_satellite/python/hw8/satelliteParamHW8.py
-
Marc Killpack authored
numpy arrays. We enforce column vectors to match the linear algebra, but that's not strictly required. In fact, current implementation requires reshaping arrays sometimes to not break stuff. But hopefully it's at least clear to students. Changes to be committed: modified: python/hw10/armController.py modified: python/hw11/armController.py modified: python/hw11_armSim.py modified: python/hw12/armController.py modified: python/hw12/armParamHW12.py modified: python/hw12_armSim.py modified: python/hw13/armController.py modified: python/hw13/armParamHW13.py modified: python/hw13/dataPlotterObserver.py modified: python/hw14/armController.py modified: python/hw14/armParamHW14.py modified: python/hw18/armController.py modified: python/hw2/dataPlotter.py modified: python/hw3/armDynamics.py modified: python/hw7/armController.py modified: python/hw8/armController.py
-
- 29 Aug, 2022 3 commits
-
-
Marc Killpack authored
unstable, and HW 18 breaks because of a data type. But it's close. Will revisit in next pass.
-
Marc Killpack authored
3 years or so since we've updated them. If someone looks at and updates them according to the book, then we can easily move them back.
-
Marc Killpack authored
errors in HW 8 and 18. Will fix in next round shorly.
-
- 21 Aug, 2022 1 commit
-
-
Marc Killpack authored
method for hw18 doesn't work. Not sure why. Changes to be committed: modified: armParam.py modified: hw14/armController.py modified: hw14/armParamHW14.py renamed: hw14/armSim.py -> hw14_armSim.py modified: hw15/armParamHW15.py new file: hw15_plot.py modified: hw16/armParamHW16.py new file: hw16_plot.py modified: hw17/armParamHW17.py new file: hw17_plot.py modified: hw18/armController.py renamed: hw18/loopshape_arm.py -> hw18/armLoopShaping.py renamed: hw18/discreteFilter.py -> hw18/digitalFilter.py deleted: hw18/helper_functions.py modified: hw18/loopshape_tools.py renamed: hw18/armSim.py -> hw18_armSim.py new file: hw18_plot.py
-
- 20 Aug, 2022 1 commit
-
-
Marc Killpack authored
Changes to be committed: modified: hw10/armController.py modified: hw10/armParamHW10.py renamed: hw10/armSim.py -> hw10_armSim.py modified: hw11/armController.py deleted: hw11/armController_old.py modified: hw11/armParamHW11.py renamed: hw11/armSim.py -> hw11_armSim.py modified: hw12/armController.py modified: hw12/armParamHW12.py renamed: hw12/armSim.py -> hw12_armSim.py modified: hw13/armController.py modified: hw13/armParamHW13.py renamed: hw13/armSim.py -> hw13_armSim.py
-
- 19 Aug, 2022 1 commit
-
-
Marc Killpack authored
"unsupported"). Started fixing folder structure for debugging and intellisense to work in vs code. Halfway through case study A. Changes to be committed: renamed: hw2/armSim.py -> hw02_armSim.py renamed: hw3/armSim.py -> hw03_armSim.py renamed: hw7/armSim.py -> hw07_armSim.py renamed: hw8/armSim.py -> hw08_armSim.py renamed: ../../_a_arm/python/hw16/armFreqInputSim.py -> hw16/armFreqInputSim.py renamed: ../../_a_arm/python/hw18/discreteFilter.py -> hw18/discreteFilter.py renamed: ../../_a_arm/python/hw18/helper_functions.py -> hw18/helper_functions.py modified: hw7/armController.py modified: hw7/armParamHW7.py modified: hw8/armController.py modified: hw8/armParamHW8.py renamed: ../matlab/armParam.m -> ../unsupported_languages/matlab/armParam.m renamed: ../matlab/hw10/PIDControl.m -> ../unsupported_languages/matlab/hw10/PIDControl.m renamed: ../matlab/hw10/armController.m -> ../unsupported_languages/matlab/hw10/armController.m renamed: ../matlab/hw10/armParamHW10.m -> ../unsupported_languages/matlab/hw10/armParamHW10.m renamed: ../matlab/hw10/armSim.m -> ../unsupported_languages/matlab/hw10/armSim.m renamed: ../matlab/hw11/armController.m -> ../unsupported_languages/matlab/hw11/armController.m renamed: ../matlab/hw11/armParamHW11.m -> ../unsupported_languages/matlab/hw11/armParamHW11.m renamed: ../matlab/hw11/armSim.m -> ../unsupported_languages/matlab/hw11/armSim.m renamed: ../matlab/hw12/armController.m -> ../unsupported_languages/matlab/hw12/armController.m renamed: ../matlab/hw12/armParamHW12.m -> ../unsupported_languages/matlab/hw12/armParamHW12.m renamed: ../matlab/hw12/armSim.m -> ../unsupported_languages/matlab/hw12/armSim.m renamed: ../matlab/hw13/armController.m -> ../unsupported_languages/matlab/hw13/armController.m renamed: ../matlab/hw13/armParamHW13.m -> ../unsupported_languages/matlab/hw13/armParamHW13.m renamed: ../matlab/hw13/armSim.m -> ../unsupported_languages/matlab/hw13/armSim.m renamed: ../matlab/hw13/dataPlotterObserver.m -> ../unsupported_languages/matlab/hw13/dataPlotterObserver.m renamed: ../matlab/hw14/armController.m -> ../unsupported_languages/matlab/hw14/armController.m renamed: ../matlab/hw14/armParamHW14.m -> ../unsupported_languages/matlab/hw14/armParamHW14.m renamed: ../matlab/hw14/armSim.m -> ../unsupported_languages/matlab/hw14/armSim.m renamed: ../matlab/hw15/armParamHW15.m -> ../unsupported_languages/matlab/hw15/armParamHW15.m renamed: ../matlab/hw16/armParamHW16.m -> ../unsupported_languages/matlab/hw16/armParamHW16.m renamed: ../matlab/hw17/armParamHW17.m -> ../unsupported_languages/matlab/hw17/armParamHW17.m renamed: ../matlab/hw18/armController.m -> ../unsupported_languages/matlab/hw18/armController.m renamed: ../matlab/hw18/armSim.m -> ../unsupported_languages/matlab/hw18/armSim.m renamed: ../matlab/hw18/loopshape_arm.m -> ../unsupported_languages/matlab/hw18/loopshape_arm.m renamed: ../matlab/hw18/transferFunction.m -> ../unsupported_languages/matlab/hw18/transferFunction.m renamed: ../matlab/hw2/armAnimation.m -> ../unsupported_languages/matlab/hw2/armAnimation.m renamed: ../matlab/hw2/armParamHW2.m -> ../unsupported_languages/matlab/hw2/armParamHW2.m renamed: ../matlab/hw2/armSim.m -> ../unsupported_languages/matlab/hw2/armSim.m renamed: ../matlab/hw2/dataPlotter.m -> ../unsupported_languages/matlab/hw2/dataPlotter.m renamed: ../matlab/hw2/signalGenerator.m -> ../unsupported_languages/matlab/hw2/signalGenerator.m renamed: ../matlab/hw3/armDynamics.m -> ../unsupported_languages/matlab/hw3/armDynamics.m renamed: ../matlab/hw3/armParamHW3.m -> ../unsupported_languages/matlab/hw3/armParamHW3.m renamed: ../matlab/hw3/armSim.m -> ../unsupported_languages/matlab/hw3/armSim.m renamed: ../matlab/hw7/armController.m -> ../unsupported_languages/matlab/hw7/armController.m renamed: ../matlab/hw7/armParamHW7.m -> ../unsupported_languages/matlab/hw7/armParamHW7.m renamed: ../matlab/hw7/armSim.m -> ../unsupported_languages/matlab/hw7/armSim.m renamed: ../matlab/hw8/armController.m -> ../unsupported_languages/matlab/hw8/armController.m renamed: ../matlab/hw8/armParamHW8.m -> ../unsupported_languages/matlab/hw8/armParamHW8.m renamed: ../matlab/hw8/armSim.m -> ../unsupported_languages/matlab/hw8/armSim.m renamed: ../simulink/arm_dynamics.m -> ../unsupported_languages/simulink/arm_dynamics.m renamed: ../simulink/arm_param.m -> ../unsupported_languages/simulink/arm_param.m renamed: ../simulink/drawArm.m -> ../unsupported_languages/simulink/drawArm.m renamed: ../simulink/hw10/armParamHW10.m -> ../unsupported_languages/simulink/hw10/armParamHW10.m renamed: ../simulink/hw10/arm_ctrl.m -> ../unsupported_languages/simulink/hw10/arm_ctrl.m renamed: ../simulink/hw10/arm_sim.slx -> ../unsupported_languages/simulink/hw10/arm_sim.slx renamed: ../simulink/hw11/armParamHW11.m -> ../unsupported_languages/simulink/hw11/armParamHW11.m renamed: ../simulink/hw11/arm_ctrl.m -> ../unsupported_languages/simulink/hw11/arm_ctrl.m renamed: ../simulink/hw11/arm_sim.slx -> ../unsupported_languages/simulink/hw11/arm_sim.slx renamed: ../simulink/hw12/armParamHW12.m -> ../unsupported_languages/simulink/hw12/armParamHW12.m renamed: ../simulink/hw12/arm_ctrl.m -> ../unsupported_languages/simulink/hw12/arm_ctrl.m renamed: ../simulink/hw12/arm_sim.slx -> ../unsupported_languages/simulink/hw12/arm_sim.slx renamed: ../simulink/hw13/armParamHW13.m -> ../unsupported_languages/simulink/hw13/armParamHW13.m renamed: ../simulink/hw13/arm_ctrl.m -> ../unsupported_languages/simulink/hw13/arm_ctrl.m renamed: ../simulink/hw13/arm_sim.slx -> ../unsupported_languages/simulink/hw13/arm_sim.slx renamed: ../simulink/hw14/armParamHW14.m -> ../unsupported_languages/simulink/hw14/armParamHW14.m renamed: ../simulink/hw14/arm_ctrl.m -> ../unsupported_languages/simulink/hw14/arm_ctrl.m renamed: ../simulink/hw14/arm_sim.slx -> ../unsupported_languages/simulink/hw14/arm_sim.slx renamed: ../simulink/hw15/armParamHW15.m -> ../unsupported_languages/simulink/hw15/armParamHW15.m renamed: ../simulink/hw16/armParamHW16.m -> ../unsupported_languages/simulink/hw16/armParamHW16.m renamed: ../simulink/hw17/armParamHW17.m -> ../unsupported_languages/simulink/hw17/armParamHW17.m renamed: ../simulink/hw18/armParamHW18.m -> ../unsupported_languages/simulink/hw18/armParamHW18.m renamed: ../simulink/hw18/arm_ctrl.m -> ../unsupported_languages/simulink/hw18/arm_ctrl.m renamed: ../simulink/hw18/arm_sim.slx -> ../unsupported_languages/simulink/hw18/arm_sim.slx renamed: ../simulink/hw18/loopshape_arm.m -> ../unsupported_languages/simulink/hw18/loopshape_arm.m renamed: ../simulink/hw7/armParamHW7.m -> ../unsupported_languages/simulink/hw7/armParamHW7.m renamed: ../simulink/hw7/arm_sim.slx -> ../unsupported_languages/simulink/hw7/arm_sim.slx renamed: ../simulink/hw8/armParamHW8.m -> ../unsupported_languages/simulink/hw8/armParamHW8.m renamed: ../simulink/hw8/arm_sim.slx -> ../unsupported_languages/simulink/hw8/arm_sim.slx renamed: ../simulink/hw_a/arm_sim.slx -> ../unsupported_languages/simulink/hw_a/arm_sim.slx renamed: ../simulink/hw_b/arm_sim.slx -> ../unsupported_languages/simulink/hw_b/arm_sim.slx renamed: ../simulink/tv.jpg -> ../unsupported_languages/simulink/tv.jpg
-
- 14 Jun, 2022 1 commit
-
-
Randy Beard authored
-
- 31 May, 2022 2 commits
-
-
Randy Beard authored
-
Randy Beard authored
-
- 06 Dec, 2021 1 commit
-
-
Randy Beard authored
-
- 31 Aug, 2021 1 commit
-
-
Randy Beard authored
-
- 26 Aug, 2021 1 commit
-
-
Randy Beard authored
2021 winter merget See merge request !4
-
- 23 Aug, 2021 1 commit
-
-
Marc Killpack authored
Final code updates for W2021.
-
- 21 Aug, 2021 1 commit
-
-
Marc Killpack authored
See title.
-
- 19 Aug, 2021 2 commits
-
-
Marc Killpack authored
see title.
-
Marc Killpack authored
-
- 18 Aug, 2021 5 commits
-
-
Marc Killpack authored
keeping a record for future reference to help students understand frequency response.
-
Marc Killpack authored
Merge branch '2021_winter' of https://magiccvs.byu.edu/gitlab/control_book/control_book_public_solutions into 2021_winter
-
Marc Killpack authored
Minor changes for consistency to hw 10-12. Major changes to HW 15-18 to try and improve presentation of loopshaping.
-
Marc Killpack authored
minor changes to fix some inconsistencies between the book and homework. Chapter 15-18 examples have not yet been updated liked Case studies A and C though.
-
Marc Killpack authored
The largest changes were in the loop shaping examples. I've restructured the code to only plot when the individual files are run, but to generate the transfer functions when imported by later homeworks (like hw 18 importing things from hw 16 and 17). I also tried to make things more consistent (so that HW 10 uses the same parameters calculated from HW 8, etc.).
-
- 02 Mar, 2021 1 commit
-
-
Cammy Peterson authored
-
- 06 Jan, 2021 4 commits
-
-
Randy Beard authored
-
Randy Beard authored
-
Cammy Peterson authored
Feature jupyter See merge request !3
-
Cammy Peterson authored
2020 fall edits See merge request !2
-
- 01 Jan, 2021 1 commit
-
-
Cammy Peterson authored
-
- 31 Dec, 2020 2 commits
-
-
Cammy Peterson authored
-
Cammy Peterson authored
Updates to the Matlab portion of the code (updated state for pendulum in hw11 and hw12, changed reference to dynamics and dataPlotter, other misc.)
-