Added range limit to ananlog ch1 and the docu-Example

Added range limit to analog ch1 and the docu-Example

-Implemented range limit logic for analog out and changed the conversion model
 to include the limit case pulse = 0 and modified the digital programmable example
- Added 4th PWM channel
- Edited analog out example with comments

Author: Rocketct

examples/Analog_Out/Analog_Out.ino

@@ -0,0 +1,56 @@
+/*
+  Machine Control - Analog out Example
+
+  This example shows how to use the Analog out channels on
+  the Machine Control.
+  The example sets the channels PWM period in the setup,
+  then loops the channels voltage output value from 0V to 10.4V.
+
+  The circuit:
+   - Portenta H7
+   - Machine Control
+
+  created 17 November 2020
+  by  Riccardo Rizzo
+  modified 09 December 2020
+  by Silvio Navaretti
+  This example code is in the public domain.
+*/
+
+#include <AutomationCarrier.h>
+
+using namespace automation;
+
+void setup() {
+  //analog_out.period_ms(CHANNEL, PERIOD_MILLISECONDS);
+  analog_out.period_ms(0, 4);
+  analog_out.period_ms(1, 4);
+  analog_out.period_ms(2, 4);
+  analog_out.period_ms(3, 4);
+  
+  Serial.begin(9600);
+  Serial.println("Analog out test");
+
+}
+
+//Output values which will be changed with this variable
+float counter = 1;
+
+void loop() {
+  //analog_out.write(CHANNEL, OUTPUT_VOLTAGE_VALUE);
+  analog_out.write(0, counter);
+  analog_out.write(1, counter);
+  analog_out.write(2, counter);
+  analog_out.write(3, counter);
+  Serial.println("All channels set at "+String(counter)+"V");
+  
+  counter = counter + 0.1;
+  //Maximum output value is 10.4V
+  if (counter >= 10.5)
+  {
+    counter = 0;
+    //Additional 100ms delay introduced to manage 10.5V -> 0V fall time of 150ms
+    delay(100);
+  }
+  delay(100);
+}

examples/Digital_programmable/Digital_programmable.ino

@@ -34,17 +34,37 @@ void setup() {
 }
 
 void loop() {
+  // Write the status value to On to Pin 3
+  digital_programmables.set(IO_WRITE_CH_PIN_03, SWITCH_ON);
+  delay(1000);
+
+  // Read from Pin 3
+  Serial.println("Pin 03: " + String(digital_programmables.read(SWITCH_OFF)));
+  delay(1000);
+
+  // Write the status value to Off to Pin 3
+  digital_programmables.set(IO_WRITE_CH_PIN_03, SWITCH_OFF);
+  delay(1000);
+
+
+  // Write the status value to On to all the Output Pins
   setAll(SWITCH_ON);
+
+  // Reads from all Input Pins
   readAll();
   delay(1000);
+
+  // Write the status value to Off all to all the Output Pins
   setAll(SWITCH_OFF);
+
+  // Reads from all Input Pins
   readAll();
   delay(1000);
 
 }
 
 void setAll(PinStatus status) {
-  // write the status value to each pin
+  // Write the status value to each Pin
   digital_programmables.set(IO_WRITE_CH_PIN_00, status);
   digital_programmables.set(IO_WRITE_CH_PIN_01, status);
   digital_programmables.set(IO_WRITE_CH_PIN_02, status);
@@ -60,7 +80,7 @@ void setAll(PinStatus status) {
 }
 
 void readAll() {
-  // Reads from input pin. This API returns -1 if you try to read from a write channel.
+  // Reads from input pins. This API returns -1 if you try to read from a write channel.
   Serial.println("Pin 00: " + String(digital_programmables.read(IO_READ_CH_PIN_00)));
   Serial.println("Pin 01: " + String(digital_programmables.read(IO_READ_CH_PIN_01)));
   Serial.println("Pin 02: " + String(digital_programmables.read(IO_READ_CH_PIN_02)));

src/AutomationCarrier.h

@@ -294,12 +294,15 @@ class AnalogOutPWMClass {
 		HAL_HRTIM_TimeBaseConfig(&HrtimHandle, HRTIM_TIMERINDEX_TIMER_E, &sConfig_time_base);
 	}
 
-	bool write(uint8_t voltage) {
-		sConfig_compare.CompareValue = voltage;
+	bool write(uint8_t pulse) {
+		if (pulse > 100) {
+			pulse = 100;
+		}
+		sConfig_compare.CompareValue = pulse;
 		if (HAL_HRTIM_WaveformCompareConfig(&HrtimHandle, HRTIM_TIMERINDEX_TIMER_E, HRTIM_COMPAREUNIT_2, &sConfig_compare) != HAL_OK)
 		{
 			return false;
-		  }
+		}
 		return true;
 	}
 
@@ -327,15 +330,22 @@ extern AnalogOutPWMClass analopwm;
 class AnalogOutClass {
 public:
 	void write(int index, float voltage) {
+		if (voltage < 0) {
+			voltage = 0;
+		}
+
 		switch (index) {
 			case 0:
-				out_0.write(voltage / 10.568);
+				out_0.write(voltage / 10.5);
 				break;
 			case 1:
-				out_1.write((voltage*9.3679) +1);
+				out_1.write(voltage / 10.5);
 				break;
 			case 2:
-				out_2.write(voltage / 10.568);
+				out_2.write((voltage*9.5));
+				break;
+			case 3:
+				out_3.write(voltage / 10.5);
 				break;
 		}
 	}
@@ -345,27 +355,33 @@ class AnalogOutClass {
 				out_0.period_ms(period);
 				break;
 			case 1:
-				out_1.period_ms((period/4)*100);
+				out_1.period_ms(period);
 				break;
 			case 2:
-				out_2.period_ms(period);
+				out_2.period_ms((period/4)*100);
+				break;
+			case 3:
+				out_3.period_ms(period);
 				break;
 		}
 	}
 	mbed::PwmOut& operator[](int index) {
 		switch (index) {
 			case 0:
 				return out_0;
-			//case 1:
-				//return out_1;
-			case 2:
-				return out_2;
+			case 1:
+				return out_1;
+			//case 2:
+				//return out_2;
+			case 3:
+				return out_3;
 		}
 	}
 private:
 	mbed::PwmOut out_0 = mbed::PwmOut(PJ_11);
-	AnalogOutPWMClass out_1 = AnalogOutPWMClass();
-	mbed::PwmOut out_2 = mbed::PwmOut(PC_7);
+	mbed::PwmOut out_1 = mbed::PwmOut(PK_1);
+	AnalogOutPWMClass out_2 = AnalogOutPWMClass();
+	mbed::PwmOut out_3 = mbed::PwmOut(PC_7);
 };
 
 extern AnalogOutClass analog_out;