Skip to content

Commit 993b9f2

Browse files
gigapodgigapod
authored
Merge pull request #5 from sparkfun/main
Bring the develop branch up to main/latest release
2 parents 69cf2d1 + ba6cd53 commit 993b9f2

File tree

3 files changed

+147
-22
lines changed

3 files changed

+147
-22
lines changed

‎.github/workflows/compile-sketch.yml

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
name: Cross-compilation
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
workflow_dispatch:
8+
9+
10+
jobs:
11+
compile-sketch:
12+
runs-on: ubuntu-latest
13+
14+
strategy:
15+
fail-fast: false
16+
17+
matrix:
18+
board:
19+
# Uno
20+
# https://github.com/arduino/ArduinoCore-avr/blob/master/boards.txt
21+
- fqbn: arduino:avr:mega
22+
# platforms: |
23+
name: arduino:avr
24+
source-url: https://downloads.arduino.cc/packages/package_index.json
25+
26+
# ESP32
27+
# https://github.com/espressif/arduino-esp32/blob/master/boards.txt
28+
- fqbn: esp32:esp32:esp32
29+
# platforms: |
30+
name: esp32:esp32
31+
source-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
32+
33+
# ESP32-S2
34+
# https://github.com/espressif/arduino-esp32/blob/master/boards.txt
35+
- fqbn: esp32:esp32:esp32s2
36+
# platforms: |
37+
name: esp32:esp32
38+
source-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
39+
40+
# ESP32-C3
41+
# https://github.com/espressif/arduino-esp32/blob/master/boards.txt
42+
- fqbn: esp32:esp32:esp32c3
43+
# platforms: |
44+
name: esp32:esp32
45+
source-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
46+
47+
# Artemis / Apollo3
48+
# https://github.com/sparkfun/Arduino_Apollo3/blob/main/boards.txt
49+
- fqbn: SparkFun:apollo3:sfe_artemis_atp
50+
# platforms: |
51+
name: SparkFun:apollo3
52+
source-url: https://raw.githubusercontent.com/sparkfun/Arduino_Apollo3/master/package_sparkfun_apollo3_index.json
53+
54+
# ESP8266
55+
# https://github.com/esp8266/Arduino/blob/master/boards.txt
56+
- fqbn: esp8266:esp8266:thingdev
57+
# platforms: |
58+
name: esp8266:esp8266
59+
source-url: https://arduino.esp8266.com/stable/package_esp8266com_index.json
60+
61+
# SAMD21
62+
# https://github.com/arduino/ArduinoCore-samd/blob/master/boards.txt
63+
- fqbn: arduino:samd:mkr1000
64+
# platforms: |
65+
name: arduino:samd
66+
source-url: https://downloads.arduino.cc/packages/package_index.json
67+
68+
# Nano BLE 33 / nRF52840
69+
# https://github.com/arduino/ArduinoCore-mbed/blob/master/boards.txt
70+
- fqbn: arduino:mbed:nano33ble
71+
# platforms: |
72+
name: arduino:mbed
73+
source-url: https://downloads.arduino.cc/packages/package_index.json
74+
75+
# RP2040
76+
# https://github.com/arduino/ArduinoCore-mbed/blob/master/boards.txt
77+
- fqbn: rp2040:rp2040:sparkfun_promicrorp2040
78+
# platforms: |
79+
name: rp2040:rp2040
80+
source-url: https://github.com/earlephilhower/arduino-pico/releases/download/global/package_rp2040_index.json
81+
82+
# RP2350
83+
# https://github.com/arduino/ArduinoCore-mbed/blob/master/boards.txt
84+
- fqbn: rp2040:rp2040:sparkfun_promicrorp2350
85+
# platforms: |
86+
name: rp2040:rp2040
87+
source-url: https://github.com/earlephilhower/arduino-pico/releases/download/global/package_rp2040_index.json
88+
89+
# STM32
90+
# https://github.com/arduino/ArduinoCore-mbed/blob/master/boards.txt
91+
- fqbn: STMicroelectronics:stm32:GenF4
92+
# platforms: |
93+
name: STMicroelectronics:stm32
94+
source-url: https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json
95+
96+
steps:
97+
- name: Checkout
98+
uses: actions/checkout@v3
99+
100+
- name: Branch name
101+
run: echo running on branch ${GITHUB_REF##*/}
102+
103+
# Setup Arduino command line - install esp32 and all the libs flux needs
104+
- name: Arduino - Install and setup the Arduino CLI
105+
uses: arduino/setup-arduino-cli@v2
106+
107+
- name: Arduino - Start config file
108+
run: arduino-cli config init --additional-urls ${{ matrix.board.source-url}}
109+
110+
- name: Arduino - Update index
111+
run: arduino-cli core update-index
112+
113+
- name: Arduino - Install platform
114+
run: arduino-cli core install ${{ matrix.board.name}}
115+
116+
- name: Arduino - Install libraries
117+
run: |
118+
arduino-cli config set library.enable_unsafe_install true
119+
arduino-cli version
120+
arduino-cli lib install 'SparkFun Toolkit'
121+
122+
- name: Compile Sketch
123+
run: arduino-cli compile --fqbn ${{ matrix.board.fqbn }} examples/Example_01_Buzz --library .
124+
125+
# outputs:
126+
# report-artifact-name: ${{ steps.report-artifact-name.outputs.report-artifact-name }}
127+

‎src/sfTk/sfDevBuzzer.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ sfTkError_t sfDevBuzzer::isConnected()
5555

5656
sfTkError_t sfDevBuzzer::deviceId(uint8_t &deviceId)
5757
{
58-
return _theBus->readRegisterByte(kSfeQwiicBuzzerRegId, deviceId);
58+
return _theBus->readRegister(kSfeQwiicBuzzerRegId, deviceId);
5959
}
6060

6161
bool sfDevBuzzer::firmwareVersionMajor(uint8_t &versionMajor)
6262
{
6363
sfTkError_t err;
64-
err = _theBus->readRegisterByte(kSfeQwiicBuzzerRegFirmwareMajor, versionMajor);
64+
err = _theBus->readRegister(kSfeQwiicBuzzerRegFirmwareMajor, versionMajor);
6565
if (err == ksfTkErrOk)
6666
return true;
6767
else
@@ -71,7 +71,7 @@ bool sfDevBuzzer::firmwareVersionMajor(uint8_t &versionMajor)
7171
bool sfDevBuzzer::firmwareVersionMinor(uint8_t &versionMinor)
7272
{
7373
sfTkError_t err;
74-
err = _theBus->readRegisterByte(kSfeQwiicBuzzerRegFirmwareMinor, versionMinor);
74+
err = _theBus->readRegister(kSfeQwiicBuzzerRegFirmwareMinor, versionMinor);
7575
if (err == ksfTkErrOk)
7676
return true;
7777
else
@@ -105,22 +105,22 @@ sfTkError_t sfDevBuzzer::configureBuzzer(const uint16_t toneFrequency, const uin
105105
data[3] = durationMSB; // kSfeQwiicBuzzerRegDurationMsb
106106
data[4] = durationLSB; // kSfeQwiicBuzzerRegDurationLsb
107107

108-
return _theBus->writeRegisterRegion(kSfeQwiicBuzzerRegToneFrequencyMsb, data, dataLength);
108+
return _theBus->writeRegister(kSfeQwiicBuzzerRegToneFrequencyMsb, data, dataLength);
109109
}
110110

111111
sfTkError_t sfDevBuzzer::on()
112112
{
113-
return _theBus->writeRegisterByte(kSfeQwiicBuzzerRegActive, 1);
113+
return _theBus->writeRegisterUInt8(kSfeQwiicBuzzerRegActive, 1);
114114
}
115115

116116
sfTkError_t sfDevBuzzer::off()
117117
{
118-
return _theBus->writeRegisterByte(kSfeQwiicBuzzerRegActive, 0);
118+
return _theBus->writeRegisterUInt8(kSfeQwiicBuzzerRegActive, 0);
119119
}
120120

121121
sfTkError_t sfDevBuzzer::saveSettings()
122122
{
123-
return _theBus->writeRegisterByte(kSfeQwiicBuzzerRegSaveSettings, 1);
123+
return _theBus->writeRegisterUInt8(kSfeQwiicBuzzerRegSaveSettings, 1);
124124
}
125125

126126
sfTkError_t sfDevBuzzer::setAddress(const uint8_t &address)
@@ -130,7 +130,7 @@ sfTkError_t sfDevBuzzer::setAddress(const uint8_t &address)
130130
return ksfTkErrFail; // error immediately if the address is out of legal range
131131
}
132132

133-
sfTkError_t err = _theBus->writeRegisterByte(kSfeQwiicBuzzerRegI2cAddress, address);
133+
sfTkError_t err = _theBus->writeRegister(kSfeQwiicBuzzerRegI2cAddress, address);
134134

135135
// Check whether the write was successful
136136
if (err != ksfTkErrOk)

‎src/sfTk/sfDevBuzzerRegisters.h

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,15 @@
2121
#include <stdint.h>
2222

2323
// Register Pointer Map
24-
enum Qwiic_Buzzer_Register : uint8_t
25-
{
26-
kSfeQwiicBuzzerRegId = 0x00,
27-
kSfeQwiicBuzzerRegFirmwareMinor,
28-
kSfeQwiicBuzzerRegFirmwareMajor,
29-
kSfeQwiicBuzzerRegToneFrequencyMsb,
30-
kSfeQwiicBuzzerRegToneFrequencyLsb,
31-
kSfeQwiicBuzzerRegVolume,
32-
kSfeQwiicBuzzerRegDurationMsb,
33-
kSfeQwiicBuzzerRegDurationLsb,
34-
kSfeQwiicBuzzerRegActive,
35-
kSfeQwiicBuzzerRegSaveSettings,
36-
kSfeQwiicBuzzerRegI2cAddress,
37-
};
24+
25+
const uint8_t kSfeQwiicBuzzerRegId = 0x00;
26+
const uint8_t kSfeQwiicBuzzerRegFirmwareMinor = 0x01;
27+
const uint8_t kSfeQwiicBuzzerRegFirmwareMajor = 0x02;
28+
const uint8_t kSfeQwiicBuzzerRegToneFrequencyMsb = 0x03;
29+
const uint8_t kSfeQwiicBuzzerRegToneFrequencyLsb = 0x04;
30+
const uint8_t kSfeQwiicBuzzerRegVolume = 0x05;
31+
const uint8_t kSfeQwiicBuzzerRegDurationMsb = 0x06;
32+
const uint8_t kSfeQwiicBuzzerRegDurationLsb = 0x07;
33+
const uint8_t kSfeQwiicBuzzerRegActive = 0x08;
34+
const uint8_t kSfeQwiicBuzzerRegSaveSettings = 0x09;
35+
const uint8_t kSfeQwiicBuzzerRegI2cAddress = 0x0A;

0 commit comments

Comments
 (0)