Skip to content

Commit adf457e

Browse files
committed
Merge branch 'dev' into samd21_dev
2 parents 678c6f2 + d1fdfb7 commit adf457e

File tree

55 files changed

+1075
-263
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1075
-263
lines changed

.github/workflows/ccpp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ jobs:
1111
uses: ArminJo/[email protected]
1212
with:
1313
libraries: PciManager
14-
examples-exclude: bluepill_position_control, esp32_position_control, esp32_i2c_dual_bus_example, stm32_i2c_dual_bus_example, magnetic_sensor_spi_alt_example, simplefoc_osc_esp32_3pwm
14+
examples-exclude: bluepill_position_control, esp32_position_control, esp32_i2c_dual_bus_example, stm32_i2c_dual_bus_example, magnetic_sensor_spi_alt_example, osc_esp32_3pwm, osc_esp32_fullcontrol, nano33IoT_velocity_control

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ Therefore this is an attempt to:
1313
- <i>Support as many <b>motor + sensor + driver + mcu</b> combinations out there</i>
1414
- 🎯 Develop a modular FOC supporting BLDC driver boards:
1515
- *Low-power* gimbal driver (<5Amps) : [*Arduino Simple**FOC**Shield*](https://docs.simplefoc.com/arduino_simplefoc_shield_showcase).
16-
- ***NEW***: *Medium-power* BLDC driver (<50Amps): [*Arduino Simple**FOC**PowerShield*](https://github.com/simplefoc/Arduino-SimpleFOC-PowerShield).
16+
- ***NEW*** 📢: *Medium-power* BLDC driver (<30Amps): [Arduino <span class="simple">Simple<b>FOC</b>PowerShield</span> ](https://github.com/simplefoc/Arduino-SimpleFOC-PowerShield).
17+
- See also [@byDagor](https://github.com/byDagor)'s *fully-integrated* ESP32 based board: [Dagor Brushless Controller](https://github.com/byDagor/Dagor-Brushless-Controller)
1718

1819
##### <b> NEXT RELEASE 📢:</b> <i>Simple<b>FOC</b>library v2.1
1920
> #### Implemented features in dev branch
@@ -52,7 +53,7 @@ Therefore this is an attempt to:
5253
> - `ControlType::voltage` does not exist any more now - `MotionControlType::torque`
5354
5455

55-
## Arduino *SimpleFOCShield* v2.0.2
56+
## Arduino *SimpleFOCShield* v2.0.3
5657

5758
<p align="">
5859
<a href="https://youtu.be/G5pbo0C6ujE">
@@ -79,7 +80,7 @@ Therefore this is an attempt to:
7980
<p align=""><img src="https://simplefoc.com/assets/img/v2.jpg" height="180px"> <img src="https://simplefoc.com/assets/img/v1.jpg" height="180px"> <img src="https://docs.simplefoc.com/extras/Images/simple_foc_shield_v13_small.gif" height="180x"></p>
8081

8182

82-
## Arduino *SimpleFOClibrary* v2.0.2
83+
## Arduino *SimpleFOClibrary* v2.1
8384

8485
<p align="">
8586
<a href="https://youtu.be/Y5kLeqTc6Zk">

examples/hardware_specific_examples/Bluepill_examples/encoder/bluepill_position_control/bluepill_position_control.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ void doI(){encoder.handleIndex();}
2828
float target_angle = 0;
2929
// instantiate the commander
3030
Commander command = Commander(Serial);
31-
void doTarget(char* cmd) { command.variable(&target_angle, cmd); }
31+
void doTarget(char* cmd) { command.scalar(&target_angle, cmd); }
3232

3333

3434
void setup() {

examples/hardware_specific_examples/Bluepill_examples/magnetic_sensor/bluepill_position_control/bluepill_position_control.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ BLDCDriver3PWM driver = BLDCDriver3PWM(PB6, PB7, PB8, PB5);
3131
float target_angle = 0;
3232
// instantiate the commander
3333
Commander command = Commander(Serial);
34-
void doTarget(char* cmd) { command.variable(&target_angle, cmd); }
34+
void doTarget(char* cmd) { command.scalar(&target_angle, cmd); }
3535

3636

3737
void setup() {

examples/hardware_specific_examples/ESP32/encoder/esp32_position_control/esp32_position_control.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ void doB(){encoder.handleB();}
2020
float target_angle = 0;
2121
// instantiate the commander
2222
Commander command = Commander(Serial);
23-
void doTarget(char* cmd) { command.variable(&target_angle, cmd); }
23+
void doTarget(char* cmd) { command.scalar(&target_angle, cmd); }
2424

2525
void setup() {
2626

examples/hardware_specific_examples/ESP32/magnetic_sensor/esp32_position_control/esp32_position_control.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ BLDCDriver3PWM driver = BLDCDriver3PWM(25, 26, 27, 7);
2929
float target_angle = 0;
3030
// instantiate the commander
3131
Commander command = Commander(Serial);
32-
void doTarget(char* cmd) { command.variable(&target_angle, cmd); }
32+
void doTarget(char* cmd) { command.scalar(&target_angle, cmd); }
3333

3434
void setup() {
3535

examples/hardware_specific_examples/HMBGC_example/position_control/position_control.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PciListenerImp listenerB(encoder.pinB, doB);
3838
float target_angle = 0;
3939
// instantiate the commander
4040
Commander command = Commander(Serial);
41-
void doTarget(char* cmd) { command.variable(&target_angle, cmd); }
41+
void doTarget(char* cmd) { command.scalar(&target_angle, cmd); }
4242

4343
void setup() {
4444

examples/hardware_specific_examples/HMBGC_example/voltage_control/voltage_control.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ PciListenerImp listenerB(encoder.pinB, doB);
4444
float target_voltage = 2;
4545
// instantiate the commander
4646
Commander command = Commander(Serial);
47-
void doTarget(char* cmd) { command.variable(&target_voltage, cmd); }
47+
void doTarget(char* cmd) { command.scalar(&target_voltage, cmd); }
4848

4949
void setup() {
5050

examples/hardware_specific_examples/SAMD_examples/magnetic_sensor/nano33IoT_velocity_control.ino renamed to examples/hardware_specific_examples/SAMD_examples/nano33IoT/nano33IoT_velocity_control/nano33IoT_velocity_control.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ BLDCDriver3PWM driver = BLDCDriver3PWM(6,5,8);
2020
float target_velocity = 2.0;
2121
// instantiate the commander
2222
Commander command = Commander(SerialUSB);
23-
void doTarget(char* cmd) { command.variable(&target_velocity, cmd); }
23+
void doTarget(char* cmd) { command.scalar(&target_velocity, cmd); }
2424

2525

2626
void setup() {

examples/hardware_specific_examples/SimpleFOCShield/version_v1/single_full_control_example/single_full_control_example.ino

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ void setup() {
5353
Serial.begin(115200);
5454
// comment out if not needed
5555
motor.useMonitoring(Serial);
56+
motor.monitor_downsample = 0; // disable intially
57+
motor.monitor_variables = _MON_TARGET | _MON_VEL | _MON_ANGLE; // monitor target velocity and angle
5658

5759
// initialise motor
5860
motor.init();

0 commit comments

Comments
 (0)