fix - typo in commander

askuric · askuric · commit a553db0f8780 · 2021-03-04T21:14:12.000+01:00
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
@@ -11,4 +11,4 @@ jobs:
       uses: ArminJo/arduino-test-compile@v1.0.0
       with:
         libraries:  PciManager 
-        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
+        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
diff --git a/examples/hardware_specific_examples/SAMD_examples/nano33IoT/nano33IoT_velocity_control/nano33IoT_velocity_control.ino b/examples/hardware_specific_examples/SAMD_examples/nano33IoT/nano33IoT_velocity_control/nano33IoT_velocity_control.ino
@@ -20,7 +20,7 @@ BLDCDriver3PWM driver =  BLDCDriver3PWM(6,5,8);
 float target_velocity = 2.0;
 // instantiate the commander
 Commander command = Commander(SerialUSB);
-void doTarget(char* cmd) { command.variable(&target_velocity, cmd); }
+void doTarget(char* cmd) { command.scalar(&target_velocity, cmd); }
 
 
 void setup() {
diff --git a/examples/osc_control_examples/osc_esp32_fullcontrol/simplefoc_osc_esp32_fullcontrol.ino b/examples/osc_control_examples/osc_esp32_fullcontrol/simplefoc_osc_esp32_fullcontrol.ino
diff --git a/keywords.txt b/keywords.txt
@@ -88,6 +88,10 @@ attach	KEYWORD2
 enableInterrupt	KEYWORD2
 getValue	KEYWORD2
 handle	KEYWORD2
+scalar	KEYWORD2
+pid	KEYWORD2
+lpf	KEYWORD2
+motor	KEYWORD2
 
 
 
diff --git a/src/communication/Commander.cpp b/src/communication/Commander.cpp
@@ -35,8 +35,8 @@ void Commander::run(){
   }
 }
 
-void Commander::run(HardwareSerial& serial){
-  HardwareSerial* tmp = com_port; // save the serial instance 
+void Commander::run(Stream& serial){
+  Stream* tmp = com_port; // save the serial instance 
   // use the new serial instance to output if not available the one linked in constructor
   if(!tmp) com_port = &serial; 
 
diff --git a/src/communication/Commander.h b/src/communication/Commander.h
@@ -61,9 +61,9 @@ class Commander
      *    '#' - Number of decimal places
      *    '?' - Scan command - displays all the labels of attached nodes
      * 
-     * @param reader - HardwareSerial to read user input
+     * @param reader - Stream to read user input
      */ 
-    void run(HardwareSerial &reader);
+    void run(Stream &reader);
     /**
      * Function reading the string of user input and firing callbacks that have been added to the commander 
      * once the user has requested them - when he sends the command  

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ void Commander::run(){`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`38`		`-void Commander::run(HardwareSerial& serial){`
`39`		`- HardwareSerial* tmp = com_port; // save the serial instance`
	`38`	`+void Commander::run(Stream& serial){`
	`39`	`+ Stream* tmp = com_port; // save the serial instance`
`40`	`40`	`// use the new serial instance to output if not available the one linked in constructor`
`41`	`41`	`if(!tmp) com_port = &serial;`
`42`	`42`