Skip to content

Commit 5e06eb6

Browse files
committed
Merge avoid float division changes
# Conflicts: # cores/arduino/SERCOM.cpp
2 parents 445cc98 + 7941541 commit 5e06eb6

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

cores/arduino/SERCOM.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,10 @@ class SERCOM
214214

215215
void resetWIRE( void ) ;
216216
void enableWIRE( void ) ;
217-
void disableWIRE( void );
218-
void prepareNackBitWIRE( void ) ;
219-
void prepareAckBitWIRE( void ) ;
220-
void prepareCommandBitsWire(uint8_t cmd);
217+
void disableWIRE( void );
218+
void prepareNackBitWIRE( void ) ;
219+
void prepareAckBitWIRE( void ) ;
220+
void prepareCommandBitsWire(uint8_t cmd);
221221
bool startTransmissionWIRE(uint8_t address, SercomWireReadWriteFlag flag) ;
222222
bool sendDataMasterWIRE(uint8_t data) ;
223223
bool sendDataSlaveWIRE(uint8_t data) ;
@@ -233,12 +233,12 @@ class SERCOM
233233
bool isRestartDetectedWIRE( void ) ;
234234
bool isAddressMatch( void ) ;
235235
bool isMasterReadOperationWIRE( void ) ;
236-
bool isRXNackReceivedWIRE( void ) ;
236+
bool isRXNackReceivedWIRE( void ) ;
237237
int availableWIRE( void ) ;
238238
uint8_t readDataWIRE( void ) ;
239239
int8_t getSercomIndex(void);
240-
uint32_t getSercomFreqRef(void);
241-
#if defined(__SAMD51__)
240+
uint32_t getSercomFreqRef(void);
241+
#if defined(__SAMD51__) || defined(__SAME51__) || defined(__SAME53__) || defined(__SAME54__)
242242
// SERCOM clock source override is only available on
243243
// SAMD51 (not 21) ... but these functions are declared
244244
// regardless so user code doesn't need ifdefs or lengthy
@@ -254,9 +254,9 @@ class SERCOM
254254
uint32_t getFreqRef(void) { return F_CPU; };
255255
#endif
256256

257-
private:
258-
Sercom *sercom;
259-
uint32_t freqRef = 48000000; // Frequency corresponding to clockSource
257+
private:
258+
Sercom *sercom;
259+
uint32_t freqRef = 48000000ul; // Frequency corresponding to clockSource
260260
#if defined(__SAMD51__) || defined(__SAME51__) || defined(__SAME53__) || defined(__SAME54__)
261261
SercomClockSource clockSource;
262262
#endif

0 commit comments

Comments
 (0)