arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

fix style checking: (#7222)

Browse Source 
- (some) core files are astyled
- ci was only checking libraries
=> now everything is checked
This commit is contained in:
david gauchard 2020-04-18 03:37:12 +02:00 committed by GitHub
parent 77b82a0c27
commit ce0e63f629
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
cores/esp8266/core_esp8266_si2c.cpp
View File

@ -31,31 +31,31 @@ extern "C" {
#include "ets_sys.h" #include "ets_sys.h"
}; };
// Inline helpers // Inline helpers
static inline __attribute__((always_inline)) void SDA_LOW(const int twi_sda) static inline __attribute__((always_inline)) void SDA_LOW(const int twi_sda)
{ {
GPES = (1 << twi_sda); GPES = (1 << twi_sda);
} }
static inline __attribute__((always_inline)) void SDA_HIGH(const int twi_sda) static inline __attribute__((always_inline)) void SDA_HIGH(const int twi_sda)
{ {
GPEC = (1 << twi_sda); GPEC = (1 << twi_sda);
} }
static inline __attribute__((always_inline)) bool SDA_READ(const int twi_sda) static inline __attribute__((always_inline)) bool SDA_READ(const int twi_sda)
{ {
return (GPI & (1 << twi_sda)) != 0; return (GPI & (1 << twi_sda)) != 0;
} }
static inline __attribute__((always_inline)) void SCL_LOW(const int twi_scl) static inline __attribute__((always_inline)) void SCL_LOW(const int twi_scl)
{ {
GPES = (1 << twi_scl); GPES = (1 << twi_scl);
} }
static inline __attribute__((always_inline)) void SCL_HIGH(const int twi_scl) static inline __attribute__((always_inline)) void SCL_HIGH(const int twi_scl)
{ {
GPEC = (1 << twi_scl); GPEC = (1 << twi_scl);
} }
static inline __attribute__((always_inline)) bool SCL_READ(const int twi_scl) static inline __attribute__((always_inline)) bool SCL_READ(const int twi_scl)
{ {
return (GPI & (1 << twi_scl)) != 0; return (GPI & (1 << twi_scl)) != 0;
} }
// Implement as a class to reduce code size by allowing access to many global variables with a single base pointer // Implement as a class to reduce code size by allowing access to many global variables with a single base pointer
@ -126,10 +126,12 @@ private:
{ {
esp8266::polledTimeout::oneShotFastUs timeout(twi_clockStretchLimit); esp8266::polledTimeout::oneShotFastUs timeout(twi_clockStretchLimit);
esp8266::polledTimeout::periodicFastUs yieldTimeout(5000); esp8266::polledTimeout::periodicFastUs yieldTimeout(5000);
while(!timeout && !SCL_READ(twi_scl)) // outer loop is stretch duration up to stretch limit while (!timeout && !SCL_READ(twi_scl)) // outer loop is stretch duration up to stretch limit
{ {
if (yieldTimeout) // inner loop yields every 5ms if (yieldTimeout) // inner loop yields every 5ms
{
yield(); yield();
}
} }
} }
@ -161,23 +163,29 @@ static Twi twi;
void Twi::setClock(unsigned int freq) void Twi::setClock(unsigned int freq)
{ {
if (freq < 1000) // minimum freq 1000Hz to minimize slave timeouts and WDT resets if (freq < 1000) // minimum freq 1000Hz to minimize slave timeouts and WDT resets
{
freq = 1000; freq = 1000;
}
preferred_si2c_clock = freq; preferred_si2c_clock = freq;
#if F_CPU == FCPU80 #if F_CPU == FCPU80
if (freq > 400000) if (freq > 400000)
{
freq = 400000; freq = 400000;
}
twi_dcount = (500000000 / freq); // half-cycle period in ns twi_dcount = (500000000 / freq); // half-cycle period in ns
twi_dcount = (1000*(twi_dcount - 1120)) / 62500; // (half cycle - overhead) / busywait loop time twi_dcount = (1000 * (twi_dcount - 1120)) / 62500; // (half cycle - overhead) / busywait loop time
#else #else
if (freq > 800000) if (freq > 800000)
{
freq = 800000; freq = 800000;
}
twi_dcount = (500000000 / freq); // half-cycle period in ns twi_dcount = (500000000 / freq); // half-cycle period in ns
twi_dcount = (1000*(twi_dcount - 560)) / 31250; // (half cycle - overhead) / busywait loop time twi_dcount = (1000 * (twi_dcount - 560)) / 31250; // (half cycle - overhead) / busywait loop time
#endif #endif
} }
@ -221,7 +229,7 @@ void Twi::enableSlave()
} }
} }
void ICACHE_RAM_ATTR Twi::busywait(unsigned int v) void ICACHE_RAM_ATTR Twi::busywait(unsigned int v)
{ {
unsigned int i; unsigned int i;
for (i = 0; i < v; i++) // loop time is 5 machine cycles: 31.25ns @ 160MHz, 62.5ns @ 80MHz for (i = 0; i < v; i++) // loop time is 5 machine cycles: 31.25ns @ 160MHz, 62.5ns @ 80MHz

2
tests/ci/style_check.sh
View File

@ -12,4 +12,4 @@ ${org}/../restyle.sh
git --version || true git --version || true
git submodule foreach --recursive 'git reset --hard' git submodule foreach --recursive 'git reset --hard'
git diff --exit-code -- $TRAVIS_BUILD_DIR/libraries git diff --exit-code -- $TRAVIS_BUILD_DIR