Skip to content

Commit 05d2651

Browse files
jsimpso81jsimpso81
committed
Add field display vi, menu, macros, documentation issue #155 
1 parent 6b448de commit 05d2651

24 files changed

+164
-59
lines changed

‎FRC_LV_Trajectory_Library/Macros/macro_Field_Display_Constant.vi‎

18.2 KB
Binary file not shown.

‎FRC_LV_Trajectory_Library/Macros/macro_Field_Display_Selector.vi‎

19.4 KB
Binary file not shown.

‎FRC_LV_Trajectory_Library/Trajectory_Library.lvlib‎

Lines changed: 53 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ This implements the math section (and some other routines) contained in FRC WPIL
6262
<Item Name="macro_DigSeqLogic_OneShot.vi" Type="VI" URL="../Macros/macro_DigSeqLogic_OneShot.vi"/>
6363
<Item Name="macro_Elevator_Sim_Execute.vi" Type="VI" URL="../Macros/macro_Elevator_Sim_Execute.vi"/>
6464
<Item Name="macro_ElevatorFF_Calculate.vi" Type="VI" URL="../Macros/macro_ElevatorFF_Calculate.vi"/>
65+
<Item Name="macro_Field_Display_Constant.vi" Type="VI" URL="../Macros/macro_Field_Display_Constant.vi"/>
66+
<Item Name="macro_Field_Display_Selector.vi" Type="VI" URL="../Macros/macro_Field_Display_Selector.vi"/>
6567
<Item Name="macro_FiniteStateMachine_Template.vi" Type="VI" URL="../Macros/macro_FiniteStateMachine_Template.vi"/>
6668
<Item Name="macro_FiniteStateMachine_w_Timer_Template.vi" Type="VI" URL="../Macros/macro_FiniteStateMachine_w_Timer_Template.vi"/>
6769
<Item Name="macro_FlyWheel_Sim_Execute.vi" Type="VI" URL="../Macros/macro_FlyWheel_Sim_Execute.vi"/>
@@ -107,6 +109,8 @@ This implements the math section (and some other routines) contained in FRC WPIL
107109
<Item Name="macro_ProfiledPIDController_Execute.vi" Type="VI" URL="../Macros/macro_ProfiledPIDController_Execute.vi"/>
108110
<Item Name="macro_Ramsete_Execute.vi" Type="VI" URL="../Macros/macro_Ramsete_Execute.vi"/>
109111
<Item Name="macro_Ramsete_Execute_ENG.vi" Type="VI" URL="../Macros/macro_Ramsete_Execute_ENG.vi"/>
112+
<Item Name="macro_Ramsete_Execute_External_Odometry.vi" Type="VI" URL="../Macros/macro_Ramsete_Execute_External_Odometry.vi"/>
113+
<Item Name="macro_Ramsete_Execute_External_Odometry_ENG.vi" Type="VI" URL="../Macros/macro_Ramsete_Execute_External_Odometry_ENG.vi"/>
110114
<Item Name="macro_Rotation2d_AngleDeg.vi" Type="VI" URL="../Macros/macro_Rotation2d_AngleDeg.vi"/>
111115
<Item Name="macro_Rotation2d_AngleRad.vi" Type="VI" URL="../Macros/macro_Rotation2d_AngleRad.vi"/>
112116
<Item Name="macro_Rotation2d_X_Y.vi" Type="VI" URL="../Macros/macro_Rotation2d_X_Y.vi"/>
@@ -189,6 +193,9 @@ This implements the math section (and some other routines) contained in FRC WPIL
189193
<Item Name="ELEVATOR_SIM_SIMULATION_PARAMS.ctl" Type="VI" URL="../TypeDef/ELEVATOR_SIM_SIMULATION_PARAMS.ctl"/>
190194
<Item Name="EXTENDED_KALMAN_CORRECT_FUNC_GROUP.ctl" Type="VI" URL="../TypeDef/EXTENDED_KALMAN_CORRECT_FUNC_GROUP.ctl"/>
191195
<Item Name="EXTENDED_KALMAN_FILTER.ctl" Type="VI" URL="../TypeDef/EXTENDED_KALMAN_FILTER.ctl"/>
196+
<Item Name="FieldDisp_ElementPicture.ctl" Type="VI" URL="../TypeDef/FieldDisp_ElementPicture.ctl"/>
197+
<Item Name="FieldDisp_Field_Info.ctl" Type="VI" URL="../TypeDef/FieldDisp_Field_Info.ctl"/>
198+
<Item Name="FieldDisp_FieldElement.ctl" Type="VI" URL="../TypeDef/FieldDisp_FieldElement.ctl"/>
192199
<Item Name="FLYWHEEL_SIM.ctl" Type="VI" URL="../TypeDef/FLYWHEEL_SIM.ctl"/>
193200
<Item Name="FLYWHEEL_SIM_SIMULATION_PARAMS.ctl" Type="VI" URL="../TypeDef/FLYWHEEL_SIM_SIMULATION_PARAMS.ctl"/>
194201
<Item Name="FUNCTION_GENERATOR.ctl" Type="VI" URL="../TypeDef/FUNCTION_GENERATOR.ctl"/>
@@ -302,38 +309,6 @@ This implements the math section (and some other routines) contained in FRC WPIL
302309
</Item>
303310
<Item Name="VI" Type="Folder">
304311
<Property Name="NI.SortType" Type="Int">0</Property>
305-
<Item Name="AprilTag" Type="Folder">
306-
<Item Name="AprilTag" Type="Folder">
307-
<Item Name="AprilTag.ctl" Type="VI" URL="../TypeDef/AprilTag.ctl"/>
308-
<Item Name="AprilTag_Equals.vi" Type="VI" URL="../VI/AprilTag_Equals.vi"/>
309-
<Item Name="AprilTag_GetAll.vi" Type="VI" URL="../VI/AprilTag_GetAll.vi"/>
310-
<Item Name="AprilTag_New.vi" Type="VI" URL="../VI/AprilTag_New.vi"/>
311-
</Item>
312-
<Item Name="AprilTagFieldLayout" Type="Folder">
313-
<Item Name="AprilTagFieldLayout.ctl" Type="VI" URL="../TypeDef/AprilTagFieldLayout.ctl"/>
314-
<Item Name="AprilTagFieldLayout_GetField.vi" Type="VI" URL="../VI/AprilTagFieldLayout_GetField.vi"/>
315-
<Item Name="AprilTagFieldLayout_GetOriginPosition.vi" Type="VI" URL="../VI/AprilTagFieldLayout_GetOriginPosition.vi"/>
316-
<Item Name="AprilTagFieldLayout_GetTagPose.vi" Type="VI" URL="../VI/AprilTagFieldLayout_GetTagPose.vi"/>
317-
<Item Name="AprilTagFieldLayout_GetTags.vi" Type="VI" URL="../VI/AprilTagFieldLayout_GetTags.vi"/>
318-
<Item Name="AprilTagFieldLayout_New.vi" Type="VI" URL="../VI/AprilTagFieldLayout_New.vi"/>
319-
<Item Name="AprilTagFieldLayout_New2022.vi" Type="VI" URL="../VI/AprilTagFieldLayout_New2022.vi"/>
320-
<Item Name="AprilTagFieldLayout_New2023.vi" Type="VI" URL="../VI/AprilTagFieldLayout_New2023.vi"/>
321-
<Item Name="AprilTagFieldLayout_NewSelect.vi" Type="VI" URL="../VI/AprilTagFieldLayout_NewSelect.vi"/>
322-
<Item Name="AprilTagFieldLayout_SetOrigin.vi" Type="VI" URL="../VI/AprilTagFieldLayout_SetOrigin.vi"/>
323-
<Item Name="AprilTagFieldLayout_SetOrigin_Position.vi" Type="VI" URL="../VI/AprilTagFieldLayout_SetOrigin_Position.vi"/>
324-
<Item Name="AprilTagFieldLayoutOrignPosition_ENUM.ctl" Type="VI" URL="../Enum/AprilTagFieldLayoutOrignPosition_ENUM.ctl"/>
325-
<Item Name="AprilTagFields_ENUM.ctl" Type="VI" URL="../Enum/AprilTagFields_ENUM.ctl"/>
326-
</Item>
327-
<Item Name="AprilTagPoseEstimate" Type="Folder">
328-
<Item Name="AprilTagPoseEstimate.ctl" Type="VI" URL="../TypeDef/AprilTagPoseEstimate.ctl"/>
329-
<Item Name="AprilTagPoseEstimate_GetAll.vi" Type="VI" URL="../VI/AprilTagPoseEstimate_GetAll.vi"/>
330-
<Item Name="AprilTagPoseEstimate_GetAmbifuity.vi" Type="VI" URL="../VI/AprilTagPoseEstimate_GetAmbifuity.vi"/>
331-
<Item Name="AprilTagPoseEstimate_New.vi" Type="VI" URL="../VI/AprilTagPoseEstimate_New.vi"/>
332-
</Item>
333-
<Item Name="AprilTagPoseEstimator" Type="Folder">
334-
<Item Name="AprilTagPoseEstimator_New.vi" Type="VI" URL="../AprilTagPoseEstimator_New.vi"/>
335-
</Item>
336-
</Item>
337312
<Item Name="Classical Analog" Type="Folder">
338313
<Item Name="AnalogDelay" Type="Folder">
339314
<Item Name="AnalogDelay_Execute.vi" Type="VI" URL="../VI/AnalogDelay_Execute.vi"/>
@@ -531,8 +506,6 @@ This implements the math section (and some other routines) contained in FRC WPIL
531506
<Item Name="Ramsete_AtReference.vi" Type="VI" URL="../Ramsete_AtReference.vi"/>
532507
<Item Name="Ramsete_Calculate.vi" Type="VI" URL="../Ramsete_Calculate.vi"/>
533508
<Item Name="Ramsete_Calculate_Trajectory.vi" Type="VI" URL="../Ramsete_Calculate_Trajectory.vi"/>
534-
<Item Name="Ramsete_Diff_DO_Eng.vi" Type="VI" URL="../Ramsete_Diff_DO_Eng.vi"/>
535-
<Item Name="Ramsete_Diff_DO_SI.vi" Type="VI" URL="../Ramsete_Diff_DO_SI.vi"/>
536509
<Item Name="Ramsete_Execute.vi" Type="VI" URL="../Ramsete_Execute.vi"/>
537510
<Item Name="Ramsete_Execute_ENG.vi" Type="VI" URL="../Ramsete_Execute_ENG.vi"/>
538511
<Item Name="Ramsete_Execute_Ext_Odom.vi" Type="VI" URL="../VI/Ramsete_Execute_Ext_Odom.vi"/>
@@ -1809,6 +1782,38 @@ This implements the math section (and some other routines) contained in FRC WPIL
18091782
<Item Name="Util_TrajState_to_DiffDrive_WheelPos.vi" Type="VI" URL="../Util_TrajState_to_DiffDrive_WheelPos.vi"/>
18101783
</Item>
18111784
<Item Name="Vision" Type="Folder">
1785+
<Item Name="AprilTag" Type="Folder">
1786+
<Item Name="AprilTag" Type="Folder">
1787+
<Item Name="AprilTag.ctl" Type="VI" URL="../TypeDef/AprilTag.ctl"/>
1788+
<Item Name="AprilTag_Equals.vi" Type="VI" URL="../VI/AprilTag_Equals.vi"/>
1789+
<Item Name="AprilTag_GetAll.vi" Type="VI" URL="../VI/AprilTag_GetAll.vi"/>
1790+
<Item Name="AprilTag_New.vi" Type="VI" URL="../VI/AprilTag_New.vi"/>
1791+
</Item>
1792+
<Item Name="AprilTagFieldLayout" Type="Folder">
1793+
<Item Name="AprilTagFieldLayout.ctl" Type="VI" URL="../TypeDef/AprilTagFieldLayout.ctl"/>
1794+
<Item Name="AprilTagFieldLayout_GetField.vi" Type="VI" URL="../VI/AprilTagFieldLayout_GetField.vi"/>
1795+
<Item Name="AprilTagFieldLayout_GetOriginPosition.vi" Type="VI" URL="../VI/AprilTagFieldLayout_GetOriginPosition.vi"/>
1796+
<Item Name="AprilTagFieldLayout_GetTagPose.vi" Type="VI" URL="../VI/AprilTagFieldLayout_GetTagPose.vi"/>
1797+
<Item Name="AprilTagFieldLayout_GetTags.vi" Type="VI" URL="../VI/AprilTagFieldLayout_GetTags.vi"/>
1798+
<Item Name="AprilTagFieldLayout_New.vi" Type="VI" URL="../VI/AprilTagFieldLayout_New.vi"/>
1799+
<Item Name="AprilTagFieldLayout_New2022.vi" Type="VI" URL="../VI/AprilTagFieldLayout_New2022.vi"/>
1800+
<Item Name="AprilTagFieldLayout_New2023.vi" Type="VI" URL="../VI/AprilTagFieldLayout_New2023.vi"/>
1801+
<Item Name="AprilTagFieldLayout_NewSelect.vi" Type="VI" URL="../VI/AprilTagFieldLayout_NewSelect.vi"/>
1802+
<Item Name="AprilTagFieldLayout_SetOrigin.vi" Type="VI" URL="../VI/AprilTagFieldLayout_SetOrigin.vi"/>
1803+
<Item Name="AprilTagFieldLayout_SetOrigin_Position.vi" Type="VI" URL="../VI/AprilTagFieldLayout_SetOrigin_Position.vi"/>
1804+
<Item Name="AprilTagFieldLayoutOrignPosition_ENUM.ctl" Type="VI" URL="../Enum/AprilTagFieldLayoutOrignPosition_ENUM.ctl"/>
1805+
<Item Name="AprilTagFields_ENUM.ctl" Type="VI" URL="../Enum/AprilTagFields_ENUM.ctl"/>
1806+
</Item>
1807+
<Item Name="AprilTagPoseEstimate" Type="Folder">
1808+
<Item Name="AprilTagPoseEstimate.ctl" Type="VI" URL="../TypeDef/AprilTagPoseEstimate.ctl"/>
1809+
<Item Name="AprilTagPoseEstimate_GetAll.vi" Type="VI" URL="../VI/AprilTagPoseEstimate_GetAll.vi"/>
1810+
<Item Name="AprilTagPoseEstimate_GetAmbifuity.vi" Type="VI" URL="../VI/AprilTagPoseEstimate_GetAmbifuity.vi"/>
1811+
<Item Name="AprilTagPoseEstimate_New.vi" Type="VI" URL="../VI/AprilTagPoseEstimate_New.vi"/>
1812+
</Item>
1813+
<Item Name="AprilTagPoseEstimator" Type="Folder">
1814+
<Item Name="AprilTagPoseEstimator_New.vi" Type="VI" URL="../AprilTagPoseEstimator_New.vi"/>
1815+
</Item>
1816+
</Item>
18121817
<Item Name="ComputerVisionUtil" Type="Folder">
18131818
<Item Name="CompVisionUtil_CalculateDistanceToTarget.vi" Type="VI" URL="../VI/CompVisionUtil_CalculateDistanceToTarget.vi"/>
18141819
<Item Name="CompVisionUtil_EstimateCameraToTarget.vi" Type="VI" URL="../VI/CompVisionUtil_EstimateCameraToTarget.vi"/>
@@ -1817,6 +1822,20 @@ This implements the math section (and some other routines) contained in FRC WPIL
18171822
<Item Name="CompVisionUtil_EstimateFieldToRobot_Alt.vi" Type="VI" URL="../VI/CompVisionUtil_EstimateFieldToRobot_Alt.vi"/>
18181823
<Item Name="CompVisionUtil_ObjectToRobotPose.vi" Type="VI" URL="../VI/CompVisionUtil_ObjectToRobotPose.vi"/>
18191824
</Item>
1825+
<Item Name="FieldDisplay" Type="Folder">
1826+
<Item Name="FieldDisp_Convert_IMAQ_Image_to_Picture.vi" Type="VI" URL="../VI/FieldDisp_Convert_IMAQ_Image_to_Picture.vi"/>
1827+
<Item Name="FieldDisp_Element_Disp.vi" Type="VI" URL="../VI/FieldDisp_Element_Disp.vi"/>
1828+
<Item Name="FieldDisp_Element_Prepare.vi" Type="VI" URL="../VI/FieldDisp_Element_Prepare.vi"/>
1829+
<Item Name="FieldDisp_Element_Rotate.vi" Type="VI" URL="../VI/FieldDisp_Element_Rotate.vi"/>
1830+
<Item Name="FieldDisp_Element_Rotate_Init.vi" Type="VI" URL="../VI/FieldDisp_Element_Rotate_Init.vi"/>
1831+
<Item Name="FieldDisp_Field_Crop_and_Scale.vi" Type="VI" URL="../VI/FieldDisp_Field_Crop_and_Scale.vi"/>
1832+
<Item Name="FieldDisp_Field_Disp.vi" Type="VI" URL="../VI/FieldDisp_Field_Disp.vi"/>
1833+
<Item Name="FieldDisp_Field_Selector_Prepare.vi" Type="VI" URL="../VI/FieldDisp_Field_Selector_Prepare.vi"/>
1834+
<Item Name="FieldDisp_Get_Field_Info.vi" Type="VI" URL="../VI/FieldDisp_Get_Field_Info.vi"/>
1835+
<Item Name="FieldDisp_Open_Field_Info_File.vi" Type="VI" URL="../VI/FieldDisp_Open_Field_Info_File.vi"/>
1836+
<Item Name="FieldDisp_Read_Field_Pic.vi" Type="VI" URL="../VI/FieldDisp_Read_Field_Pic.vi"/>
1837+
<Item Name="FieldDisp_Read_Image_File.vi" Type="VI" URL="../VI/FieldDisp_Read_Image_File.vi"/>
1838+
</Item>
18201839
</Item>
18211840
</Item>
18221841
<Item Name="License.rtf" Type="Document" URL="../License.rtf"/>

‎FRC_LV_Trajectory_Library/TypeDef/EXTENDED_KALMAN_FILTER.ctl‎

-36 Bytes
Binary file not shown.

‎FRC_LV_Trajectory_Library/TypeDef/FieldDisp_ElementPicture.ctl‎

17.9 KB
Binary file not shown.

‎FRC_LV_Trajectory_Library/TypeDef/FieldDisp_FieldElement.ctl‎

21.4 KB
Binary file not shown.

‎FRC_LV_Trajectory_Library/TypeDef/FieldDisp_Field_Info.ctl‎

19.6 KB
Binary file not shown.

‎FRC_LV_Trajectory_Library/VI/FieldDisp_Convert_IMAQ_Image_to_Picture.vi‎

19 KB
Binary file not shown.

‎FRC_LV_Trajectory_Library/VI/FieldDisp_Element_Disp.vi‎

24.3 KB
Binary file not shown.

‎FRC_LV_Trajectory_Library/VI/FieldDisp_Element_Prepare.vi‎

24.9 KB
Binary file not shown.

0 commit comments

Comments
 (0)