Merge pull request #53 from adafruit/fix-esp-min

Fix esp min

.github/workflows/githubci.yml

@@ -29,25 +29,6 @@ jobs:
  - name: test platforms
  run: python3 ci/build_platform.py ${{ matrix.arduino-platform }}
 
- clang_and_doxy:
- runs-on: ubuntu-latest
- needs: build
- steps:
- - name: Setup Python
- uses: actions/setup-python@v1
- with:
- python-version: '3.x' 
- - name: Checkout code
- uses: actions/checkout@v2
- - name: Checkout adafruit/ci-arduino
- uses: actions/checkout@v2
- with:
- repository: adafruit/ci-arduino
- path: ci
-
- - name: pre-install
- run: bash ci/actions_install.sh
-
  - name: clang
  # skip clang for fatfs (ff) to make it easier to compare and upgrade
  run: python3 ci/run-clang-format.py -e "ci/*" -e "bin/*" -e "./examples/SdFat_format/*" -r .

src/Adafruit_SPIFlashBase.cpp

@@ -102,8 +102,8 @@ bool Adafruit_SPIFlashBase::begin(SPIFlash_Device_t const *flash_dev) {
  delayMicroseconds(30);
 
  // Speed up to max device frequency, or as high as possible
- _trans->setClockSpeed(
- min(_flash_dev->max_clock_speed_mhz * 1000000UL, F_CPU));
+ _trans->setClockSpeed(min(
+ (uint32_t)(_flash_dev->max_clock_speed_mhz * 1000000U), (uint32_t)F_CPU));
 
  // Enable Quad Mode if available
  if (_trans->supportQuadMode() && (_flash_dev->quad_enable_bit_mask)) {