Merge remote-tracking branch 'upstream/edge' into fix/trapezoid-symmetry

Conflicts:
	src/libs/Pin.h

diff --cc src/libs/Pin.cpp
index bdbbaed,cdd1f44..4136791
--- 1/src/libs/Pin.cpp
--- 2/src/libs/Pin.cpp
+++ b/src/libs/Pin.cpp
@@@ -1,12 -1,12 +1,15 @@@
  #include "Pin.h"
- 
  #include "utils.h"
  
+ // mbed libraries for hardware pwm
+ #include "PwmOut.h"
+ #include "PinNames.h"
+ 
  Pin::Pin(){
      this->inverting= false;
 +    this->valid= false;
 +    this->pin= 32;
 +    this->port= nullptr;
  }
  
  // Make a new pin object from a string

diff --cc src/libs/Pin.h
index f93934a,38e7db5..53ad20b
--- 1/src/libs/Pin.h
--- 2/src/libs/Pin.h
+++ b/src/libs/Pin.h
@@@ -57,15 -63,12 +62,17 @@@ class Pin 
                  this->port->FIOCLR = 1 << this->pin;
          }
  
 -        
+         mbed::PwmOut *hardware_pwm();
++
 +        // these should be private, and use getters
          LPC_GPIO_TypeDef* port;
 -        bool inverting;
 -        char port_number;
 +
          unsigned char pin;
 +        char port_number;
 +        struct {
 +            bool inverting:1;
 +            bool valid:1;
 +        };
  };
  
  

diff --cc src/main.cpp
Simple merge