@@ -119,15 +119,14 @@ static const uint8_t outcfg_tbl[32][4] =
119
119
{OUTC (1 , 7 , 1 ), OUTC (0 , 6 , 0 ), OUTC (1 , 7 , 0 ), OUTC (1 , 3 , 1 )}, // CTX31: B7OUT2, A6OUT, B7OUT, B3OUT2
120
120
};
121
121
122
- uint16_t _analogBits = 10 ; // 10-bit by default
123
- uint8_t _analogWriteBits = 8 ; // 8-bit by default for writes
124
- uint8_t _servoWriteBits = 8 ; // 8-bit by default for writes
122
+ uint16_t _analogBits = 10 ; // 10-bit by default
123
+ uint8_t _analogWriteBits = 8 ; // 8-bit by default for writes
124
+ uint8_t _servoWriteBits = 8 ; // 8-bit by default for writes
125
125
static bool ap3_adc_initialized = false ; // flag to show if the ADC has been initialized
126
126
127
127
uint16_t analogRead (uint8_t pinNumber)
128
128
{
129
- if (!ap3_adc_initialized)
130
- {
129
+ if (!ap3_adc_initialized){
131
130
ap3_adc_setup ();
132
131
ap3_adc_initialized = true ;
133
132
}
@@ -175,7 +174,6 @@ uint16_t analogRead(uint8_t pinNumber)
175
174
ap3_change_channel (padNumber); // Point ADC channel at this pad
176
175
177
176
// Clear the ADC interrupt.
178
- am_hal_adc_interrupt_status (g_ADCHandle, &ui32IntMask, true );
179
177
if (AM_HAL_STATUS_SUCCESS != am_hal_adc_interrupt_clear (g_ADCHandle, ui32IntMask))
180
178
{
181
179
// Serial.println("Error clearing ADC interrupt status");
@@ -672,12 +670,12 @@ ap3_err_t servoWriteResolution(uint8_t res)
672
670
673
671
uint8_t getServoResolution ()
674
672
{
675
- return (_servoWriteBits);
673
+ return (_servoWriteBits);
676
674
}
677
675
678
676
ap3_err_t servoWrite (uint8_t pin, uint32_t val)
679
677
{
680
- return (servoWrite (pin, val, 544 , 2400 )); // Call servoWrite with Arduino default min/max microseconds. See: https://www.arduino.cc/en/Reference/ServoAttach
678
+ return (servoWrite (pin, val, 544 , 2400 )); // Call servoWrite with Arduino default min/max microseconds. See: https://www.arduino.cc/en/Reference/ServoAttach
681
679
}
682
680
683
681
ap3_err_t servoWrite (uint8_t pin, uint32_t val, uint16_t minMicros, uint16_t maxMicros)
@@ -689,9 +687,9 @@ ap3_err_t servoWrite(uint8_t pin, uint32_t val, uint16_t minMicros, uint16_t max
689
687
uint32_t fw = 60000 ; // 20 ms wide frame
690
688
691
689
// Convert microSeconds to PWM counts.
692
- uint32_t min = minMicros * 3 ;
690
+ uint32_t min = minMicros * 3 ;
693
691
uint32_t max = maxMicros * 3 ;
694
-
692
+
695
693
uint32_t th = (uint32_t )(((max - min) * val) / fsv) + min;
696
694
697
695
return ap3_pwm_output (pin, th, fw, clk);
0 commit comments