Changeset 774

Timestamp:

07/31/08 13:16:09 (4 months ago)

Author:

liamstask

Message:

- incorporating additions from #64
- can more easily configure PWM channels - timing, alignment, etc.
- more & better doc for PWM

Location:

firmware/trunk

Files:

• core/makingthings/pwm.c (modified) (4 diffs)
• core/makingthings/pwm.h (modified) (1 diff)
• libraries/pwmout/pwmout.c (modified) (7 diffs)
• libraries/pwmout/pwmout.h (modified) (1 diff)

firmware/trunk/core/makingthings/pwm.c

@@ -19 +19 @@
   PWM - Pulse Width Modulation.
   Library of functions for the Make Application Board's PwmOut Subsystem.
-  //ToDo: DW choose which functions are public, and confirm/correct annotations
 */
 
@@ -59 +58 @@
 } Pwm;
 
-/** \defgroup Pwm PWM
-  The Pwm subsystem provides control of the 4 PWM outputs on the SAM7X.
-  The Pwm subsystem of the Controller Board can be used independently from the PWM_Out subsystem
-  of the Application Board, and in fact the AppBoard PwmOut relies on the Controller Board PWM.
+/** \defgroup Pwm PWM (Pulse Width Modulation)
+  The PWM subsystem provides control of the 4 PWM outputs on the SAM7X.
+
+  The Make Controller has 4 PWM lines.  These can each be configured separately and can control
+  up to 2 output lines directly, the 2 lines running either parallel or inverted.  For a very simple
+  start, just see Pwm_Set( ) and Pwm_Get( ) as these will start driving your PWMs immediately with
+  very little hassle.  
+
+  \section padjust Period adjustment of the PWM unit
+  Configuring and setting the clock for the PWM system can be quite a complicated matter.  Here are 
+  some of the relevant issues.
+  
+  Each of the 4 PWM channels is fed in a clock, as determined by its clock source:
+   - Clock source 0-10 represent the Master clock divided by 2 to the power of the Clock Source Value.  eg. a clock 
+   source value of 5 = a clock rate of MasterClock/(2^5)
+   - A value of 11 sets the Clock source to be generated by clock Divider A (Default)
+   - A value of 12 sets the Clock source to be generated by clock Divider B
+  
+  If either Clock Divider A or Clock Divider B is used, you can adjust their values individually to
+  allow the clock period to precisely match your needs.  Each clock divider has two values, a \b Mux value 
+  and a \b Divider value.  
+  
+  The mux works just like the clock source values, and chooses Master clock divided by 2 to 
+  the power of the Clock Source Value, eg. a DividerXMux value of 5 == a clock rate of MasterClock/(2^5).
+  The Divider value sets a linear divider, which is fed the clock value as selected by the Mux, and returns that 
+  clock value divided by the divider value.  This output value is what is fed out of the divider unit.  A output 
+  formula: 
+  \code output = MCLK / ( (2^DividerMux) * DividerValue ) \endcode
   
-  @see PWM_Out
+  The PWM subsystem of the Controller Board can be used independently from the \ref PwmOut 
+  library, since the \ref PwmOut library relies on the core PWM.
+
   \ingroup Core
   @{
@@ -99 +124 @@
   return Pwm.duty[ index ];
 }
-
-/** @}
-*/
 
 int Pwm_Start( int channel )
@@ -243 +265 @@
   return io;
 }
+
+/**
+  Adjust the clock period on Divider A.
+  See AT91SAM7X manual for more information p.421
+
+  Contributed by TheStigg - http://www.makingthings.com/author/thestigg
+  @param val An int between 0 and 4096.
+  @return 0 on success.
+*/
+int Pwm_SetDividerA(int val)
+{ 
+  if( val < 0 || val > ( 1 << 12 ) )
+    return CONTROLLER_ERROR_ILLEGAL_PARAMETER_VALUE;
+
+  // First disable PWM controller for all 4 channels.
+  AT91C_BASE_PWMC->PWMC_DIS = 0x0000000f;
+
+  // Now Set the new Clock values
+  AT91C_BASE_PWMC->PWMC_MR = (AT91C_BASE_PWMC->PWMC_MR & 0xffff0000) | val;
+
+  // Re-enable the active channels
+  AT91C_BASE_PWMC->PWMC_ENA = Pwm.channels;
+  
+  return CONTROLLER_OK;
+}
+
+/**
+  Read the clock period on Divider A.
+
+  Contributed by TheStigg - http://www.makingthings.com/author/thestigg
+  @return The clock period on Divider A.
+*/
+int Pwm_GetDividerA()
+{
+  return (AT91C_BASE_PWMC->PWMC_MR & 0x0000ffff);
+}
+
+/**
+  Adjust the clock period on Divider B.
+  See AT91SAM7X manual for more information p.421
+
+  Contributed by TheStigg - http://www.makingthings.com/author/thestigg
+  @param val An int between 0 and 4096.
+  @return 0 on success.
+*/
+int Pwm_SetDividerB(int val)
+{ 
+  if( val < 0 || val > ( 1 << 12 ) )
+    return CONTROLLER_ERROR_ILLEGAL_PARAMETER_VALUE;
+
+  //New function which adjusts the clock period on Divider A.
+  //See AT91SAM7X manual for more information p.421
+
+  // First disable PWM controller for all 4 channels.
+  AT91C_BASE_PWMC->PWMC_DIS = 0x0000000f;
+
+  // Now Set the new Clock values
+  AT91C_BASE_PWMC->PWMC_MR = (AT91C_BASE_PWMC->PWMC_MR & 0x0000ffff) | ( val << 16 );
+
+  // Re-enable the active channels
+  AT91C_BASE_PWMC->PWMC_ENA = Pwm.channels;
+  
+  return CONTROLLER_OK;
+}
+
+/**
+  Read the clock period on Divider B.
+
+  Contributed by TheStigg - http://www.makingthings.com/author/thestigg
+  @return The clock period on Divider B.
+*/
+int Pwm_GetDividerB()
+{
+  return (AT91C_BASE_PWMC->PWMC_MR >> 16);
+}
+
+/**
+  Set the clock divider for a particular channel.
+  For values 0-10, the Master_Clock is divided by (2^val).  For example,
+  for 4 the resulting period will be Master Clock / 16, as 2 ^ 4 == 16.
+
+  When val is 11, Clock Divider A is used.  When val is 12, Clock Divider B
+  is used.  Values other than 0 - 12 are not valid.
+
+  Contributed by TheStigg - http://www.makingthings.com/author/thestigg
+  @param channel The PWM channel (0-3) you'd like to configure.
+  @param val The new clock divider.
+  @return 0 on success.
+*/
+int Pwm_SetClockSource(int channel, int val)
+{
+  if ( channel < 0 || channel > PWM_COUNT )
+    return CONTROLLER_ERROR_ILLEGAL_INDEX;
+
+  if ( val < 0 || val > 12 )
+    return CONTROLLER_ERROR_ILLEGAL_PARAMETER_VALUE;
+
+  AT91S_PWMC_CH *pwm = &AT91C_BASE_PWMC->PWMC_CH[ channel ];
+  int c = 1 << channel;
+
+  // Disable the Channel
+  AT91C_BASE_PWMC->PWMC_DIS = c;
+
+  // Set the Channel Divider Value
+  pwm->PWMC_CMR = (pwm->PWMC_CMR & 0x00000700) | val;
+  
+  // Re-enable the Channel
+  AT91C_BASE_PWMC->PWMC_ENA = c;
+
+  return CONTROLLER_OK;
+}
+
+/**
+  Read the clock source for a particular channel.
+  Contributed by TheStigg - http://www.makingthings.com/author/thestigg
+  @param channel The PWM channel (0-3) whose channel you'd like to read.
+  @return The clock source.
+  @see Pwm_SetClockSource( )
+*/
+int Pwm_GetClockSource(int channel)
+{
+  if ( channel < 0 || channel > PWM_COUNT )
+    return CONTROLLER_ERROR_ILLEGAL_INDEX;
+
+  return (AT91C_BASE_PWMC->PWMC_CH[ channel ].PWMC_CMR & 0x0000000f);
+}
+
+/**
+  Set the wave form properties of the PWM contoller for a given channel.
+  The waveform properties are controlled by bits 0, 1, and 2.
+   - bit 0 sets whether the PWModule is Left aligned (0) or Center aligned (1)
+   - bit 1 sets whether the PWMoudle's polarity starts out low (0) or high (1)
+   - bit 2 is not supported at this time.
+
+  Contributed by TheStigg - http://www.makingthings.com/author/thestigg
+  @param channel the PWM channel (0-3) that you want to configure
+  @param val The mask of values as described above.
+  @return 0 on success.
+*/
+int Pwm_SetWaveformProperties(int channel, int val)
+{
+  if ( channel < 0 || channel > PWM_COUNT )
+    return CONTROLLER_ERROR_ILLEGAL_INDEX;
+
+  if ( val < 0 || val > 3 )
+    return CONTROLLER_ERROR_ILLEGAL_PARAMETER_VALUE;
+
+  AT91S_PWMC_CH *pwm = &AT91C_BASE_PWMC->PWMC_CH[ channel ];
+  int c = 1 << channel;
+
+  // Disable the Channel
+  AT91C_BASE_PWMC->PWMC_DIS = c;
+
+  // Set the Channel Divider Value
+  pwm->PWMC_CMR = (pwm->PWMC_CMR & 0x0000040f) | ( val << 8 );
+  
+  // Re-enable the Channel
+  AT91C_BASE_PWMC->PWMC_ENA = c;
+
+  return CONTROLLER_OK;
+}
+
+/**
+  Read the waveform configuration of a specified PWM channel
+
+  Contributed by TheStigg - http://www.makingthings.com/author/thestigg
+  @param channel The PWM channel (0-3) to read from.
+  @return A bitmask describing the waveform configuration.
+  @see Pwm_SetWaveformProperties( )
+*/
+int Pwm_GetWaveformProperties(int channel)
+{
+  if ( channel < 0 || channel > PWM_COUNT )
+    return CONTROLLER_ERROR_ILLEGAL_INDEX;
+  
+  return ( (AT91C_BASE_PWMC->PWMC_CH[ channel ].PWMC_CMR >> 8) & 0x00000003 );
+}
+
+/** @}
+*/

firmware/trunk/core/makingthings/pwm.h

@@ -30 +30 @@
 int Pwm_Get( int index );
 
+int Pwm_SetDividerA(int val);
+int Pwm_GetDividerA( void );
+
+int Pwm_SetDividerB(int val);
+int Pwm_GetDividerB( void );
+
+int Pwm_SetClockSource(int channel, int val);
+int Pwm_GetClockSource(int channel);
+
+int Pwm_SetWaveformProperties(int channel, int val);
+int Pwm_GetWaveformProperties(int channel);
+
+
 #endif

firmware/trunk/libraries/pwmout/pwmout.c

@@ -324 +324 @@
 }
 
-/** @}
-*/
-
 int PwmOut_Start( int index )
 {
@@ -445 +442 @@
 }
 
+/**
+  Set the divider A value.
+  Contributed by TheStigg - http://www.makingthings.com/author/thestigg
+  @param val The value (between 0 and 255)
+  @return 0 on success.
+*/
+int PwmOut_SetDividerAValue(int val)
+{
+   if( val < 0 || val > 255 )
+    return CONTROLLER_ERROR_ILLEGAL_PARAMETER_VALUE;
+   
+   int v = Pwm_GetDividerA();
+   
+   //strip off the divider Value
+   v &= 0x00000f00;
+   
+   //add on the new Value
+   v |= val;
+
+   return Pwm_SetDividerA( v );
+}
+
+/**
+  Read the divider A value.
+  Contributed by TheStigg - http://www.makingthings.com/author/thestigg
+  @return the divider A value (0 - 255)
+  @see PwmOut_SetDividerAValue( )
+*/
+int PwmOut_GetDividerAValue()
+{
+  return ( Pwm_GetDividerA() & 0x000000ff );
+}
+
+/**
+  Set the divider A mux value.
+  @param mux The mux value (between 0 and 10)
+  Contributed by TheStigg - http://www.makingthings.com/author/thestigg
+  @return 0 on success.
+*/
+int PwmOut_SetDividerAMux(int mux)
+{
+   if( mux < 0 || mux > 10 )
+    return CONTROLLER_ERROR_ILLEGAL_PARAMETER_VALUE;
+   
+   int v = Pwm_GetDividerA();
+   
+   //strip off the divider Value
+   v &= 0x000000ff;
+   
+   //add on the new Value
+   v |= ( mux << 8 );
+
+   return Pwm_SetDividerA( v );
+}
+/**
+  Read the divider A mux value.
+  Contributed by TheStigg - http://www.makingthings.com/author/thestigg
+  @return the divider A mux value (0 - 10)
+  @see PwmOut_SetDividerAMux( )
+*/
+int PwmOut_GetDividerAMux()
+{
+  return ( ( Pwm_GetDividerA() >> 8 ) & 0x0000000f );
+}
+
+/**
+  Set the divider B value.
+  Contributed by TheStigg - http://www.makingthings.com/author/thestigg
+  @param val The value (between 0 and 255)
+  @return 0 on success.
+*/
+int PwmOut_SetDividerBValue(int val)
+{
+   if( val < 0 || val > 255 )
+    return CONTROLLER_ERROR_ILLEGAL_PARAMETER_VALUE;
+   
+   int v = Pwm_GetDividerB();
+   
+   //strip off the divider Value
+   v &= 0x00000f00;
+   
+   //add on the new Value
+   v |= val;
+
+   return Pwm_SetDividerA( v );
+}
+
+/**
+  Read the divider B value.
+  Contributed by TheStigg - http://www.makingthings.com/author/thestigg
+  @return the divider B value (0 - 255)
+  @see PwmOut_SetDividerBValue( )
+*/
+int PwmOut_GetDividerBValue()
+{
+  return ( Pwm_GetDividerB() & 0x000000ff );
+}
+
+/**
+  Set the divider B mux value.
+  @param mux The mux value (between 0 and 10)
+  Contributed by TheStigg - http://www.makingthings.com/author/thestigg
+  @return 0 on success.
+*/
+int PwmOut_SetDividerBMux(int mux)
+{
+   if( mux < 0 || mux > 10 )
+    return CONTROLLER_ERROR_ILLEGAL_PARAMETER_VALUE;
+   
+   int v = Pwm_GetDividerB();
+   
+   //strip off the divider Value
+   v &= 0x000000ff;
+   
+   //add on the new Value
+   v |= ( mux << 8 );
+
+   return Pwm_SetDividerB( v );
+}
+
+/**
+  Read the divider B mux value.
+  Contributed by TheStigg - http://www.makingthings.com/author/thestigg
+  @return the divider B mux value (0 - 10)
+  @see PwmOut_SetDividerBMux( )
+*/
+int PwmOut_GetDividerBMux()
+{
+  return ( ( Pwm_GetDividerB() >> 8 ) & 0x0000000f );
+}
+
+/**
+  Set the alignment of a channel's waveform.
+  Valid values are:
+  - 0 = Left Aligned (default)
+  - 1 = Center Aligned
+
+  Contributed by TheStigg - http://www.makingthings.com/author/thestigg
+  @param index The PWM channel (0-3) that you'd like to configure.
+  @param val The alignment value, as described above.
+  @return 0 on success.
+*/
+int PwmOut_SetWaveformAlignment(int index, int val)
+{
+  if ( index < 0 || index > 3 )
+    return CONTROLLER_ERROR_ILLEGAL_INDEX;
+  if ( val > 1 || val < 0 )
+    return CONTROLLER_ERROR_ILLEGAL_PARAMETER_VALUE;
+
+  int currval = Pwm_GetWaveformProperties( index ) & 0x00000006; //Leave bits 2 & 3 alone
+  currval |= val;
+  return Pwm_SetWaveformProperties( index, currval );
+}
+
+/**
+  Read the configured waveform alignment for a given PWM channel.
+
+  Contributed by TheStigg - http://www.makingthings.com/author/thestigg
+  @param index The PWM channel (0-3) you'd like to read from.
+  @return the waveform alignment - see PwmOut_SetWaveformAlignment( )
+*/
+int PwmOut_GetWaveformAlignment( int index )
+{
+  int val = Pwm_GetWaveformProperties( index );
+  if ( val < 0 )
+    return val;
+  
+  return val  & 0x00000001;
+}
+
+/**
+  Set the Waveform Polarity for a PWM channel.
+  Valid values are:
+   - 0 = Start Waveform Low
+   - 1 = Start Waveform High (default)
+
+  Contributed by TheStigg - http://www.makingthings.com/author/thestigg
+  @param index The PWM channel (0-3) that you'd like to configure.
+  @param val The value, as described above.
+  @return 0 on success.
+*/
+int PwmOut_SetWaveformPolarity(int index, int val)
+{
+  if ( index < 0 || index > 3 )
+    return CONTROLLER_ERROR_ILLEGAL_INDEX;
+  if ( val > 1 || val < 0 )
+    return CONTROLLER_ERROR_ILLEGAL_PARAMETER_VALUE;
+
+  int currval = Pwm_GetWaveformProperties( index ) & 0x00000005; //Leave bits 3 & 1 alone
+  currval |= (val << 1);
+  return Pwm_SetWaveformProperties( index, currval );
+}
+
+/**
+  Read the waveform polarity for a given channel.
+
+  Contributed by TheStigg - http://www.makingthings.com/author/thestigg
+  @param index The PWM channel (0-3) that you'd like to read from.
+  @return The configured polarity for that channel.
+  @see PwmOut_SetWaveformPolarity( )
+*/
+int PwmOut_GetWaveformPolarity( int index )
+{
+  int val = Pwm_GetWaveformProperties( index );
+  if ( val < 0 )
+    return val;
+  
+  return val  & 0x00000002;
+}
+
+/** @}
+*/
+
 #ifdef OSC
 
-/** \defgroup PWMOutOSC PWM Out - OSC
+/** \defgroup pwmout_osc PWM Out - OSC
   Generate PWM signals with the Application Board via OSC.
   \ingroup OSC
@@ -463 +673 @@
   
   \section properties Properties
-  Each PWM Out has four properties:
+  Each PWM Out has the following properties:
   - duty
   - invA
   - invB
   - active
-
-  \par Duty
+  - dividerAValue
+  - dividerAMux
+  - dividerBValue
+  - dividerBMux
+  - clockSource
+  - alignment
+  - polarity
+
+  \subsection Duty
   The \b duty property corresponds to the duty at which a load connected to the output is being driven.
   This value can be both read and written.  The range of values expected by the board
   is from 0 - 1023.
-  \par
-  To generate a 75% on PWM signal, send a message like
+
+  To generate a 75% on PWM signal, send a message like
   \verbatim /pwmout/1/duty 768 \endverbatim
   Leave the argument value off to read the duty:
   \verbatim /pwmout/1/duty \endverbatim
   
-  \par invA
+  \subsection invA
   The \b invA property corresponds to the inversion of the A channel of a PWM Out.
   This value can be both read and written, and the range of values expected is simply 
   0 or 1.  1 means inverted and 0 means normal.  0 is the default.
-  \par
+  
   To set the A channel of the second PWM Out as inverted, send the message
   \verbatim /pwmout/1/invA 1 \endverbatim
   Note that the A channel of PWM Out 1 is Digital Out 2.
   
-  \par invB
+  \subsection invB
   The \b invB property corresponds to the inversion of the B channel of a PWM Out.
   This value can be both read and written, and the range of values expected is simply 
   0 or 1.  1 means inverted and 0 means normal.  0 is the default.
-  \par
+  
   To set the B channel of the fourth PWM Out back to normal, send the message
   \verbatim /pwmout/1/invB 0 \endverbatim
   Note that the A channel of PWM Out 1 is Digital Out 7.
   
-  \par Active
+  \subsection Active
   The \b active property corresponds to the active state of the PWM Out.
   If the device is set to be active, no other tasks will be able to
@@ -504 +721 @@
   locked by sending a message like
   \verbatim /pwmout/0/active \endverbatim
-  \par
+  
   If you're no longer using the PWM Out, it's a good idea to free the 2 Digital Outs by 
   sending the message
   \verbatim /pwmout/0/active 0 \endverbatim
+
+  \section p_adjust Period adjustment of the PWM unit
+
+  The below values allow you to adjust the period length to all possible values as supported
+  by the physical limits of the Make Controller.  Before altering the values, it is good to understand
+  a little about the subsustem of the PWM module.  Please see the general introduction in the \ref Pwm section.
+
+  \subsection DividerBValue
+  The \b dividerXValue property corresponds to the linear divider value within clock divider module X of the 
+  PWM Out.  This value can be between 0 and 255, and linearly divides the clock that is fed into it.  You can 
+  change the incomming clock value by altering the DividerAMux parameter.  Higher linear divider values mean 
+  a longer period.
+  
+  Default value of DividerA is 4. Default value of DividerB is 0.
+
+  \subsection divs DividerAMux & DividerBMux
+  The \b dividerAMux and \b dividerBMux properties select the incoming clock value for divider module A or B (respectively)
+  of the PWM Out.  This value ranges between 0 and 10.  This is similar to the clock source value, eg. a DividerAMux 
+  value of 5 = a clock rate of MasterClock/(2^5)
+  
+  Increasing this value will substantially increase the period of the PWM.  Use the DividerXValue parameter 
+  to more finely tune the value of the period.  
+  
+  Default value of MuxA is 4.  Default value of MuxB is 0.        
+
+  \subsection ClockSource
+  The \b clockSource property selects the incoming clock value for the specified PWM channel. A clock 
+  source of \b 0-10 represents the Master clock divided by 2 to the power of the Clock Source Value, eg. a clock 
+  source value of 5 = a clock rate of MasterClock/(2^5).  A value of \b 11 sets the Clock source to be 
+  generated by clock Divider A.  A value of \b 12 sets the Clock source to be generated by clock Divider B
+  
+  The default value is 11 (Divider A).
+
+  \subsection WaveformAlignment
+  The \b waveformAlignment property chooses whether the channel is left aligned or center aligned.
+  The following values are valid:
+   - 0 = Left aligned
+   - 1 = Center aligned
+  
+  A left aligned channel counts up to the maximum duty cycle, then resets the counter.  A center aligned 
+  channel counts up to the maximum duty cycle, then counts down to zero, etc. The default is left aligned.
+
+  \subsection WaveformPolarity
+  The \b polarity property chooses whether the channel begins its period high or low.  The following values are valid:
+   - 0 = Normal Polarity
+   - 1 = Inverted Polarity
+  
+  Normal polarity starts low, then goes high.  Inverted polarity starts high, then goes low.  The default is inverted polarity.
 */
 
@@ -517 +782 @@
 // MUST end in zero
 static char* PwmOutOsc_Name = "pwmout";
-static char* PwmOutOsc_PropertyNames[] = { "active", "duty", "invA", "invB", 0 }; // must have a trailing 0
+static char* PwmOutOsc_PropertyNames[] = { "active", "duty", "invA", "invB", 
+             "dividerAValue", "dividerAMux",
+             "dividerBValue", "dividerBMux",
+             "clockSource", "alignment",
+             "polarity",
+             0 }; // must have a trailing 0
 
 int PwmOutOsc_PropertySet( int index, int property, int value );
@@ -559 +829 @@
       PwmOut_SetInvertB( index, value );
       break;
+    case 4:
+      PwmOut_SetDividerAValue(value);
+      break;
+    case 5:
+      PwmOut_SetDividerAMux(value);
+      break;
+    case 6:
+      PwmOut_SetDividerBValue(value);
+      break;
+    case 7:
+      PwmOut_SetDividerBMux(value);
+      break;
+    case 8:
+      Pwm_SetClockSource( index, value );
+      break;
+    case 9:
+      PwmOut_SetWaveformAlignment( index, value );
+      break;
+    case 10:
+      PwmOut_SetWaveformPolarity( index, value );
+      break;
   }
   return CONTROLLER_OK;
@@ -581 +872 @@
       value = PwmOut_GetInvertB( index );
       break;
+    case 4:
+      value = PwmOut_GetDividerAValue();
+      break;
+    case 5:
+      value = PwmOut_GetDividerAMux();
+      break;
+    case 6:
+      value = PwmOut_GetDividerBValue();
+      break;
+    case 7:
+      value = PwmOut_GetDividerBMux();
+      break;
+    case 8:
+      value = Pwm_GetClockSource( index );
+      break;
+    case 9:
+      value = PwmOut_GetWaveformAlignment( index );
+      break;
+    case 10:
+      value = PwmOut_GetWaveformPolarity( index );
+      break;
   }
   return value;

firmware/trunk/libraries/pwmout/pwmout.h

@@ -45 +45 @@
 int PwmOut_SetAll( int motor, int duty, char invertA, char invertB );
 
+// Divider A is used by default to setup the clock period.
+// Read the notes in controll/makingthings/pwm.c before changing these.
+int PwmOut_SetDividerAValue(int val);
+int PwmOut_GetDividerAValue( void );
+
+int PwmOut_SetDividerAMux(int mux);
+int PwmOut_GetDividerAMux( void );
+
+int PwmOut_SetDividerBValue(int val);
+int PwmOut_GetDividerBValue( void );
+
+int PwmOut_SetDividerBMux(int mux);
+int PwmOut_GetDividerBMux( void );
+
+int PwmOut_SetWaveformAlignment(int index, int val);
+int PwmOut_GetWaveformAlignment(int index);
+
+int PwmOut_SetWaveformPolarity(int index, int val);
+int PwmOut_GetWaveformPolarity(int index);
+
 /* OSC Interface */
 const char* PwmOutOsc_GetName( void );