Skip to content

micro step 1/4 -> 1/8 change #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
7 changes: 5 additions & 2 deletions .github/workflows/compile-sketches.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
platforms: | # ESP32公式のpackage indexを使用する
- name: esp32:esp32
source-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
version: 2.0.17
sketch-paths: |
- pico_v2_STEP1_LED
- pico_v2_STEP2_SWITCH
Expand All @@ -40,7 +41,7 @@ jobs:

# This step is needed to pass the size data to the report job
- name: Upload sketches report to workflow artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.SKETCHES_REPORTS_ARTIFACT_NAME }}
path: ${{ env.SKETCHES_REPORTS_PATH }}
Expand All @@ -52,12 +53,14 @@ jobs:
steps:
# This step is needed to get the size data produced by the compile jobs
- name: Download sketches reports artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.SKETCHES_REPORTS_ARTIFACT_NAME }}
path: ${{ env.SKETCHES_REPORTS_PATH }}
continue-on-error: true

- uses: arduino/report-size-deltas@v1
with:
sketches-reports-source: ${{ env.SKETCHES_REPORTS_PATH }}
github-token: ${{ secrets.GITHUB_TOKEN }}
continue-on-error: true
2 changes: 1 addition & 1 deletion pico_v2_STEP5_Straight/pico_v2_STEP5_Straight.ino
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

#define MIN_HZ 40
#define TIRE_DIAMETER (24.70)
#define PULSE (TIRE_DIAMETER * PI / (35.0 / 10.0 * 20.0 * 4.0))
#define PULSE (TIRE_DIAMETER * PI / (35.0 / 10.0 * 20.0 * 8.0))
#define MIN_SPEED (MIN_HZ * PULSE)

hw_timer_t * g_timer0 = NULL;
Expand Down
2 changes: 1 addition & 1 deletion pico_v2_STEP6_rotate/pico_v2_STEP6_rotate.ino
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

#define MIN_HZ 40
#define TIRE_DIAMETER (24.70)
#define PULSE (TIRE_DIAMETER * PI / (35.0 / 10.0 * 20.0 * 4.0))
#define PULSE (TIRE_DIAMETER * PI / (35.0 / 10.0 * 20.0 * 8.0))
#define MIN_SPEED (MIN_HZ * PULSE)
#define TREAD_WIDTH (31.5)

Expand Down
2 changes: 1 addition & 1 deletion pico_v2_STEP7_P_control/pico_v2_STEP7_P_control.ino
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

#define MIN_HZ 40
#define TIRE_DIAMETER (24.70)
#define PULSE (TIRE_DIAMETER * PI / (35.0 / 10.0 * 20.0 * 4.0))
#define PULSE (TIRE_DIAMETER * PI / (35.0 / 10.0 * 20.0 * 8.0))
#define MIN_SPEED (MIN_HZ * PULSE)

//環境に合わせて変更する
Expand Down
2 changes: 1 addition & 1 deletion pico_v2_STEP8_micromouse/parameter.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#define TIRE_DIAMETER (24.7)
#define TREAD_WIDTH (31.5)
#define TREAD_CIRCUIT (TREAD_WIDTH * PI / 4)
#define PULSE (TIRE_DIAMETER * PI / (35.0 / 10.0 * 20.0 * 4.0))
#define PULSE (TIRE_DIAMETER * PI / (35.0 / 10.0 * 20.0 * 8.0))
#define MIN_HZ 40

#define WAITLOOP_SLED 10
Expand Down
Loading