Skip to content

Commit dcffbcd

Browse files
authored
Merge branch 'master' into IncludeArduinoMotorCarrierLib
2 parents f28af0e + f2d4c4f commit dcffbcd

File tree

6 files changed

+6
-10
lines changed

6 files changed

+6
-10
lines changed

.github/workflows/sync-labels.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
- name: Download JSON schema for labels configuration file
3333
id: download-schema
34-
uses: carlosperate/download-file-action@v1
34+
uses: carlosperate/download-file-action@v2
3535
with:
3636
file-url: https://raw.githubusercontent.com/arduino/tooling-project-assets/main/workflow-templates/assets/sync-labels/arduino-tooling-gh-label-configuration-schema.json
3737
location: ${{ runner.temp }}/label-configuration-schema
@@ -65,7 +65,7 @@ jobs:
6565

6666
steps:
6767
- name: Download
68-
uses: carlosperate/download-file-action@v1
68+
uses: carlosperate/download-file-action@v2
6969
with:
7070
file-url: https://raw.githubusercontent.com/arduino/tooling-project-assets/main/workflow-templates/assets/sync-labels/${{ matrix.filename }}
7171

@@ -114,7 +114,7 @@ jobs:
114114
path: ${{ env.CONFIGURATIONS_FOLDER }}
115115

116116
- name: Remove unneeded artifact
117-
uses: geekyeggo/delete-artifact@v1
117+
uses: geekyeggo/delete-artifact@v2
118118
with:
119119
name: ${{ env.CONFIGURATIONS_ARTIFACT }}
120120

docs/api.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ battery.getFiltered()
1616

1717
#### Returns
1818

19-
* _getRaw()_: returns the raw ADC read from the battery as am integer.
19+
* _getRaw()_: returns the raw ADC read from the battery as an integer.
2020
* _getConverted()_: returns the battery voltage converted to volts as a floating point.
2121
* _getFiltered()_: returns the battery voltage converted to volts and filtered in the last 10 seconds.
2222

@@ -110,12 +110,12 @@ Allow setting Motor1 or Motor2 to a specific speed or position. There are two PI
110110
#### Syntax
111111

112112
```
113-
pid1. setGains(int P, int I, int D)
113+
pid1.setGains(float P, float I, float D)
114114
```
115115

116116
#### Functions
117117

118-
* _setGains(float P, float I, float D)_: Set PID gains. (`int` type for MKRMotorCarrier)
118+
* _setGains(float P, float I, float D)_: Set PID gains.
119119
* _resetGains()_: Reset PID gains to factory default settings.
120120
* _setControlMode(cl_control)_: Set control mode to either `CL_VELOCITY` or `CL_POSITION`.
121121
* _setSetpoint(cl_mode, int target)_: Set a specific velocity or position in one of the motors. Define cl_mode as `TARGET_POSITION` or `TARGET_VELOCITY` and the desired value in target.

examples/Nano/DCMotorTest/DCMotorTest.ino

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include <ArduinoMotorCarrier.h>
2-
#define INTERRUPT_PIN 6
32

43
//Variable to store the battery voltage
54
static int batteryVoltage;

examples/Nano/EncoderTest/EncoderTest.ino

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include <ArduinoMotorCarrier.h>
2-
#define INTERRUPT_PIN 6
32

43
//Variable to store the battery voltage
54
static int batteryVoltage;

examples/Nano/PID_Position_test/PID_Position_test.ino

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include <ArduinoMotorCarrier.h>
2-
#define INTERRUPT_PIN 6
32

43
//Variable to store the battery voltage
54
static int batteryVoltage;

examples/Nano/ServoTest/ServoTest.ino

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#include <ArduinoMotorCarrier.h>
33
//#include <MKRMotorCarrier.h>
44
//#include <MKRMotorCarrier_REV2.h>
5-
#define INTERRUPT_PIN 6
65

76

87
void setup()

0 commit comments

Comments
 (0)