Merge pull request #11 from maidnl/get_PWM_functions_used_wrong_index

Opta Controller: Get pwm functions used wrong index

Author: maidnl

examples/Analog/PWM/PWM.ino

@@ -101,6 +101,7 @@ void optaAnalogTask() {
          rising = 1;
       }
     }
+
     for(int i = 0; i < OptaController.getExpansionNum(); i++) {
 
       AnalogExpansion aexp = OptaController.getExpansion(i);
@@ -122,6 +123,25 @@ void optaAnalogTask() {
 	}
       }
     }
+    for(int i = 0; i < OptaController.getExpansionNum(); i++) {
+
+      AnalogExpansion aexp = OptaController.getExpansion(i);
+
+      if(aexp) {
+	Serial.println("PWM ch 0 period " +
+	String(aexp.getPwmPeriod(OA_FIRST_PWM_CH))+ 
+	  " pulse " + aexp.getPwmPulse(OA_FIRST_PWM_CH));
+	Serial.println("PWM ch 1 period " +
+	String(aexp.getPwmPeriod(OA_FIRST_PWM_CH + 1)) + 
+	" pulse " + aexp.getPwmPulse(OA_FIRST_PWM_CH + 1));
+	Serial.println("PWM ch 2 period " +
+	String(aexp.getPwmPeriod(OA_FIRST_PWM_CH + 2)) + 
+	  " pulse " + aexp.getPwmPulse(OA_FIRST_PWM_CH + 2));
+	Serial.println("PWM ch 3 period " +
+	String(aexp.getPwmPeriod(OA_FIRST_PWM_CH + 3))+ 
+	    " pulse " + aexp.getPwmPulse(OA_FIRST_PWM_CH + 2));
+      }
+    }
   }
 }
 

src/AnalogExpansion.cpp

@@ -502,8 +502,17 @@ void AnalogExpansion::setPwm(uint8_t ch, uint32_t period, uint32_t pulse) {
    * the value is already up to date*/
 }
 
+/* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */
+
 /* get Pwm period in micro seconds */
   uint32_t AnalogExpansion::getPwmPeriod(uint8_t ch) {
+    if (ch >= OA_FIRST_PWM_CH && ch <= OA_LAST_PWM_CH) {
+      ch = ch - OA_FIRST_PWM_CH;
+    }
+    else if(ch >= OA_PWM_CHANNELS_NUM) {
+      return 0;
+    }
+    
     uint32_t per_add = BASE_OA_PWM_ADDRESS + ch;
     if (!addressExist(per_add)) {
       return 0;
@@ -512,18 +521,29 @@ void AnalogExpansion::setPwm(uint8_t ch, uint32_t period, uint32_t pulse) {
       return iregs[per_add];
     }
   }
+
+/* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */
+
   /* get Pwm pulse in micro seconds */
   uint32_t AnalogExpansion::getPwmPulse(uint8_t ch) {
+    if (ch >= OA_FIRST_PWM_CH && ch <= OA_LAST_PWM_CH) {
+      ch = ch - OA_FIRST_PWM_CH;
+    }
+    else if(ch >= OA_PWM_CHANNELS_NUM) {
+      return 0;
+    }
+    
     uint32_t pul_add = BASE_OA_PWM_ADDRESS + ch + OA_PWM_CHANNELS_NUM;
     if (!addressExist(pul_add)) {
       return 0;
     }
     else {
       return iregs[pul_add];
     }
-
   }
 
+/* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */
+
   float AnalogExpansion::getPwmFreqHz(uint8_t ch) {
     float period = (float)getPwmPeriod(ch);
     if(period > 0) {
@@ -534,11 +554,13 @@ void AnalogExpansion::setPwm(uint8_t ch, uint32_t period, uint32_t pulse) {
 
   }
 
+/* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */
+
   float AnalogExpansion::getPwmPulsePerc(uint8_t ch) {
     float period = (float)getPwmPeriod(ch);
     float pulse = (float)getPwmPulse(ch);
     if(period > 0 && pulse <= period) {
-      return pulse / period;
+      return pulse * 100.0 / period;
     }
     return 0.0;