Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/Team334/R2024
Browse files Browse the repository at this point in the history
  • Loading branch information
PGgit08 committed Jan 19, 2024
2 parents c512908 + 3d1fe89 commit 9b38fa4
Show file tree
Hide file tree
Showing 44 changed files with 371 additions and 93 deletions.
27 changes: 27 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
## Contributing to discord.py

First off, thanks for taking the time to contribute!

The following is a set of rules for contributing to this repository.

## Good Bug Reports

Please be aware of the following things when making bug reports.

1. Don't open duplicate issues. Please search your issue to see if it has been asked already. Duplicate issues will be closed and ignored.
2. When filing a bug about exceptions or tracebacks, please include the *complete* traceback. Without the complete traceback the issue might be **unsolvable** and you will be asked to provide more information.
3. Make sure to provide enough information to make the issue solvable. The issue template will guide through the process.
- A **summary** of your bug report. This is generally a quick sentence or two to describe the issue in simple terms.
- Guidance on **how to reproduce the issue**. You can provide or steps to reproduce this issue.
- Tell us **what you expected to happen**. That way we can meet that expectation.
- Tell us **what actually happens**. What ends up happening insteading of what you expected
- Tell us **information about your system information**. What version of java, wpilib, etc do you use?

If the bug report is missing this information then it'll take us longer to fix the issue. We will probably ask for clarification.

## Submitting a Pull Request

Submitting a pull request is fairly simple, just make sure it focuses on a single aspect.


If you do not meet any of these guidelines, please double check what you have missed and add those requirements
77 changes: 77 additions & 0 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
name: Bug Report
description: File a bug report
labels: ["bug"]

body:
- type: input
attributes:
label: Summary
description: >
A short summary of what your feature request is.
validations:
required: true

- type: textarea
id: expected-result
attributes:
label: What happened? What did you expect to happen?
description: What did you expect compared to reality?
validations:
required: true

- type: textarea
id: reproduction-steps
attributes:
label: What did you do to make this happened?
description: List your reproductive steps
validations:
required: true

- type: textarea
id: images
attributes:
label: If possible can you provide some images?
validations:
required: false

- type: dropdown
id: os
attributes:
label: Operating System
multiple: false
options:
- label: Windows 10/11
- label: MacOS
- label: Linux
default: 0
validations:
required: true

- type: textarea
id: sys-info
attributes:
label: Add your project information
value: >
Control + Shift + P > WPILIB Open Project Information and paste it here
validations:
required: true

- type: checkboxes
id: checkboxes
attributes:
label: Checklist
options:
- label: I've search for duplicated
required: true
- label: I have shown the entire traceback, if possible.
required: true
- label: I have provided all information about this bug.
required: true

- type: textarea
id: additional-context
attributes:
label: If there is something you like to add or say please add it here
description: Add here
validations:
required: false
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Website
url: https://bthsrobotics.com
about: Our website
43 changes: 43 additions & 0 deletions .github/ISSUE_TEMPLATE/feature.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Feature Request
description: Suggest a feature for this library
labels: ["enhancement"]
body:
- type: input
attributes:
label: Summary
description: >
A short summary of what your feature request is.
validations:
required: true
- type: textarea
attributes:
label: What is the feature request for?
description: Why is it relevant?
validations:
required: true
- type: textarea
attributes:
label: The Problem
description: >
What problem is your feature trying to solve or help?
validations:
required: true
- type: textarea
attributes:
label: The Ideal Solution
description: >
What is your ideal solution to the problem?
What would you like this feature to do?
validations:
required: true
- type: textarea
attributes:
label: The Current Solution
description: >
What is the current solution to the problem, if any?
validations:
required: false
- type: textarea
attributes:
label: Additional Context
description: If there is anything else to say, please do so here.
14 changes: 14 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
## Summary

<!-- What is this pull request for? Does it fix any issues? -->
<!-- If this fixes a issue refer the issue here -->

## Checklist

<!-- Put an x inside [ ] to check it, like so: [x] -->

- [ ] If code changes were made then they have been tested.
- [ ] I have updated the documentation to reflect the changes.
- [ ] This PR fixes an issue.
- [ ] This PR adds something new (e.g. subsystem).
- [ ] This PR is **not** a code change (e.g. README, typehinting, examples, refactoring, ...)
15 changes: 15 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "gradle" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "daily"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
34 changes: 34 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# This is a basic workflow to build robot code.

name: CI

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the main branch.
on:
push:
branches: [ main ]
pull_request:
branches: [ main ]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest

# This grabs the WPILib docker container
container: wpilib/roborio-cross-ubuntu:2024-22.04

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v4

# Grant execute permission for gradlew
- name: Grant execute permission for gradlew
run: chmod +x gradlew

# Runs a single command using the runners shell
- name: Compile and run tests on robot code
run: ./gradlew build
30 changes: 30 additions & 0 deletions .github/workflows/wpiformat.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Wpiformat

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]

jobs:
wpiformat:
name: "wpiformat"
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Fetch all history and metadata
run: |
git checkout -b pr
git branch -f main origin/main;
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3.8
- name: Install wpiformat
run: pip install wpiformat==2024.31
- name: Run
run: wpiformat
- name: Check output
run: git --no-pager diff --exit-code HEAD
2 changes: 1 addition & 1 deletion .pathplanner/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
"defaultMaxAngVel": 540.0,
"defaultMaxAngAccel": 720.0,
"maxModuleSpeed": 2.88
}
}
33 changes: 33 additions & 0 deletions .styleguide
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
cppHeaderFileInclude {
\.h$
\.hpp$
\.inc$
}

cppSrcFileInclude {
\.cpp$
}

# Extra "/" used by unit tests
generatedFileExclude {
/cpplint\.py$
}

modifiableFileExclude {
\.png$
}

licenseUpdateExclude {
Excluded\.h$
}

# Ordered this way to ensure tests find longest match
includeGuardRoots {
wpiformat/
wpiformat/Test/
}

# Used by unit tests
includeProject {
^ctre/
}
2 changes: 2 additions & 0 deletions .styleguide-license
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/*{padding}Team 334{padding}*/
/* Copyright (c) 2024 Team 334. All Rights Reserved.{padding}*/
2 changes: 1 addition & 1 deletion .wpilib/wpilib_preferences.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
"currentLanguage": "java",
"projectYear": "2024",
"teamNumber": 334
}
}
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def deployArtifact = deploy.targets.roborio.artifacts.frcJava
wpi.java.debugJni = false

// Set this to true to enable desktop support.
def includeDesktopSupport = false
def includeDesktopSupport = true

// Defining my dependencies. In this case, WPILib (+ friends), and vendor libraries.
// Also defines JUnit 5.
Expand Down
2 changes: 1 addition & 1 deletion networktables.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[]
[]
2 changes: 1 addition & 1 deletion simgui-ds.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,4 @@
}
],
"useEnableDisableHotkeys": true
}
}
2 changes: 1 addition & 1 deletion simgui.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/main/deploy/example.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Files placed in this directory will be deployed to the RoboRIO into the
'deploy' directory in the home folder. Use the 'Filesystem.getDeployDirectory' wpilib function
to get a proper path relative to the deploy directory.
to get a proper path relative to the deploy directory.
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@
},
"folder": null,
"choreoAuto": false
}
}
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/navgrid.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/New New Path.path
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,4 @@
"folder": null,
"previewStartingState": null,
"useDefaultConstraints": false
}
}
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/New Path.path
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,4 @@
"folder": null,
"previewStartingState": null,
"useDefaultConstraints": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@
"folder": null,
"previewStartingState": null,
"useDefaultConstraints": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@
"folder": null,
"previewStartingState": null,
"useDefaultConstraints": false
}
}
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/Test1.path
Original file line number Diff line number Diff line change
Expand Up @@ -126,4 +126,4 @@
"folder": null,
"previewStartingState": null,
"useDefaultConstraints": false
}
}
Loading

0 comments on commit 9b38fa4

Please sign in to comment.