Fix merging issues

DisruptiveInnovation6317 · Apr 12, 2019 · 124a426 · 124a426
1 parent 5a72852
commit 124a426
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/src/main/java/com/frc63175985/csp/SandstormFragment.java b/app/src/main/java/com/frc63175985/csp/SandstormFragment.java
@@ -23,7 +23,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         // Start
         Match.GUI.bindCheckbox(view, R.id.sandstorm_sandstorm_active, Match.SANDSTORM_ACTIVE);
         Match.GUI.bindCheckbox(view, R.id.sandstorm_leaves_hab_checkBox, Match.LEAVES_HAB);
-        Match.GUI.bindSpinner(getContext(), view, R.id.sandstorm_hab_level_spinner, Match.START_LEVEL, new String[]{"--------", "Low", "Middle"});
+        Match.GUI.bindSpinner(getContext(), view, R.id.sandstorm_hab_level_spinner, Match.START_LEVEL, new String[]{"--------", "Low", "Mid", "High"});
         Match.GUI.bindSpinner(getContext(), view, R.id.sandstorm_start_position_spinner, Match.START_POSITION, new String[]{"--------", "Left", "Middle", "Right"});
         Match.GUI.bindSpinner(getContext(), view, R.id.sandstorm_start_object_spinner, Match.START_OBJECT, new String[]{"--------", "N/A", "Hatch", "Cargo"});
         Match.GUI.bindCheckbox(view, R.id.sandstorm_crosses_midline_checkBox, Match.CROSS_OVER);

diff --git a/app/src/main/java/com/frc63175985/csp/TeleOpFragment.java b/app/src/main/java/com/frc63175985/csp/TeleOpFragment.java
@@ -43,7 +43,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         String[] outcomeOptions = {"--------", "Self Only", "Self Plus Others", "Others Only", "Assisted"};
         Match.GUI.bindSpinner(getContext(), view, R.id.teleop_climb_outcome_spinner, Match.CLIMB_OUTCOME, outcomeOptions);
         Match.GUI.bindSpinner(getContext(), view, R.id.teleop_climb_height_spinner, Match.CLIMB_LEVEL, PitScoutRecord.HEIGHT_OPTIONS);
-        Match.GUI.bindStepper(view, R.id.teleop_climb_assists_stepper, Match.NUMBER_CLIMB_ASSISTS);
+        Match.GUI.bindStepper(view, R.id.teleop_climb_assists_stepper, Match.NUMBER_CLIMB_ASSISTS, -1, null);
         Match.GUI.bindCheckbox(view, R.id.teleop_robot_fell_checkBox, Match.CLIMB_FALL);
 
         return view;