Callum and Adel's changes on 12/02/19
Dependencies: Crypto
Diff: main.cpp
- Revision:
- 55:e8b15b4b875f
- Parent:
- 54:bd5b586aa2e1
- Child:
- 56:0e7f794d2676
diff -r bd5b586aa2e1 -r e8b15b4b875f main.cpp --- a/main.cpp Fri Mar 22 23:47:51 2019 +0000 +++ b/main.cpp Fri Mar 22 23:49:51 2019 +0000 @@ -413,7 +413,7 @@ encState; uint32_t _mtrPeriod, // Motor period - _MAXPWM_PRD, + _MAXPWM_PRD; quadratureStates, MINPWM_PRD, maxEncCount, @@ -894,7 +894,7 @@ newPeriod = (uint32_t)(1e6/(uint32_t)noteFreq); // us if (newPeriod>oldPeriod) { // Change Period First - _pComm->_pc.printf("Period:changed \n" ); +// _pComm->_pc.printf("Period:changed \n" ); pwmCtrl.period_us(newPeriod); //set frequency of PWM pwmCtrl.pulsewidth_us((uint32_t)(newPeriod*0.8)); } else { // Change Pulse WidthFirst @@ -905,7 +905,7 @@ oldPeriod = newPeriod; testTimer.reset(); while (testTimer.read_ms() < newDur ) {} // Do nothing - _pComm->_pc.printf("Period:%d Dur:%d \n",newPeriod, newDur ); +// _pComm->_pc.printf("Period:%d Dur:%d \n",newPeriod, newDur ); } _pComm->_modeBitField = 0x04; // stop melody mode