Skip to content

Commit e0aae55

Browse files
author
Owen L - SFE
committed
undo VSC autoformatter whitespace changes
(they're just awfully annoying!)
1 parent 6902d0e commit e0aae55

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

cores/arduino/ard_sup/analog/ap3_analog.cpp

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,14 @@ static const uint8_t outcfg_tbl[32][4] =
119119
{OUTC(1, 7, 1), OUTC(0, 6, 0), OUTC(1, 7, 0), OUTC(1, 3, 1)}, // CTX31: B7OUT2, A6OUT, B7OUT, B3OUT2
120120
};
121121

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
125125
static bool ap3_adc_initialized = false; // flag to show if the ADC has been initialized
126126

127127
uint16_t analogRead(uint8_t pinNumber)
128128
{
129-
if (!ap3_adc_initialized)
130-
{
129+
if(!ap3_adc_initialized){
131130
ap3_adc_setup();
132131
ap3_adc_initialized = true;
133132
}
@@ -175,7 +174,6 @@ uint16_t analogRead(uint8_t pinNumber)
175174
ap3_change_channel(padNumber); //Point ADC channel at this pad
176175

177176
// Clear the ADC interrupt.
178-
am_hal_adc_interrupt_status(g_ADCHandle, &ui32IntMask, true);
179177
if (AM_HAL_STATUS_SUCCESS != am_hal_adc_interrupt_clear(g_ADCHandle, ui32IntMask))
180178
{
181179
//Serial.println("Error clearing ADC interrupt status");
@@ -672,12 +670,12 @@ ap3_err_t servoWriteResolution(uint8_t res)
672670

673671
uint8_t getServoResolution()
674672
{
675-
return (_servoWriteBits);
673+
return(_servoWriteBits);
676674
}
677675

678676
ap3_err_t servoWrite(uint8_t pin, uint32_t val)
679677
{
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
681679
}
682680

683681
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
689687
uint32_t fw = 60000; // 20 ms wide frame
690688

691689
//Convert microSeconds to PWM counts.
692-
uint32_t min = minMicros * 3;
690+
uint32_t min = minMicros * 3;
693691
uint32_t max = maxMicros * 3;
694-
692+
695693
uint32_t th = (uint32_t)(((max - min) * val) / fsv) + min;
696694

697695
return ap3_pwm_output(pin, th, fw, clk);

0 commit comments

Comments
 (0)