Skip to content

Commit 3971a29

Browse files
authored
doc: Fix build and update docs to fix inconsistencies (#421)
1 parent f6ac595 commit 3971a29

File tree

35 files changed

+138
-128
lines changed

35 files changed

+138
-128
lines changed

.gitmodules

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
[submodule "external/fmt"]
1+
[submodule "components/format/detail/fmt"]
22
path = components/format/detail/fmt
33
url = https://github.com/fmtlib/fmt
4-
[submodule "external/alpaca"]
4+
[submodule "components/serialization/detail/alpaca"]
55
path = components/serialization/detail/alpaca
66
url = https://github.com/p-ranav/alpaca
77
[submodule "components/esp_littlefs"]
@@ -13,28 +13,28 @@
1313
[submodule "components/esp-dsp"]
1414
path = components/esp-dsp
1515
url = https://github.com/espressif/esp-dsp
16-
[submodule "external/csv2"]
16+
[submodule "components/csv/detail/csv2"]
1717
path = components/csv/detail/csv2
1818
url = https://github.com/p-ranav/csv2
19-
[submodule "external/cli"]
19+
[submodule "components/cli/detail/cli"]
2020
path = components/cli/detail/cli
2121
url = https://github.com/daniele77/cli
22-
[submodule "external/tabulate"]
22+
[submodule "components/tabulate/detail/tabulate"]
2323
path = components/tabulate/detail/tabulate
2424
url = https://github.com/p-ranav/tabulate
2525
[submodule "lib/pybind11"]
2626
path = lib/pybind11
2727
url = https://github.com/pybind/pybind11
28-
[submodule "external/magic_enum"]
28+
[submodule "components/state_machine/detail/magic_enum"]
2929
path = components/state_machine/detail/magic_enum
3030
url = https://github.com/neargye/magic_enum
3131
[submodule "components/esp-nimble-cpp"]
3232
path = components/esp-nimble-cpp
3333
url = https://github.com/esp-cpp/esp-nimble-cpp
34-
[submodule "external/hid-rp"]
34+
[submodule "components/hid-rp/detail/hid-rp"]
3535
path = components/hid-rp/detail/hid-rp
3636
url = https://github.com/intergatedcircuits/hid-rp
37-
[submodule "external/nearby"]
37+
[submodule "components/gfps_service/detail/nearby"]
3838
path = components/gfps_service/detail/nearby
3939
url = https://github.com/google/nearby
4040
[submodule "components/binary-log/detail"]

components/ads7138/include/ads7138.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,7 @@ class Ads7138 : public BasePeripheral<> {
14001400
}
14011401

14021402
/// @brief Configure an alert events for an analog channel.
1403-
/// @param channel Channel to configure.
1403+
/// @param ch Channel to configure.
14041404
/// @param low_threshold_mv Low threshold in mV.
14051405
/// @param high_threshold_mv High threshold in mV.
14061406
/// @param event_count Number of events to trigger an alert.

components/bldc_haptics/include/detent_config.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/// @file Defines the detent configuration
2-
31
#pragma once
42

53
#include "format.hpp"

components/ble_gatt_server/include/ble_gatt_server_menu.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ namespace espp {
2121
/// the paired devices, viewing the connected devices, disconnecting devices,
2222
/// and more.
2323
///
24-
/// \section Example
24+
/// \section ble_gatt_server_menu_ex1 Example
2525
/// \snippet ble_gatt_server_example.cpp ble gatt server example
2626
class BleGattServerMenu {
2727
public:
28-
/// @brief Construct a new I2cMenu object.
29-
/// @param i2c A reference to the I2c bus to interact with.
28+
/// @brief Construct a new BleGattServerMenu.
29+
/// @param server The BleGattServer to use.
3030
explicit BleGattServerMenu(std::reference_wrapper<espp::BleGattServer> server)
3131
: server_(server) {}
3232

components/bm8563/include/bm8563.hpp

Lines changed: 38 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace espp {
88
/// @brief The BM8563 RTC driver.
99
/// @details This driver is for the BM8563 RTC chip.
1010
///
11-
/// \section Example
11+
/// \section bm8563_ex1 Example
1212
/// \snippet bm8563_example.cpp bm8563 example
1313
class Bm8563 : public BasePeripheral<> {
1414
public:
@@ -21,19 +21,56 @@ class Bm8563 : public BasePeripheral<> {
2121
uint8_t month; ///< The month.
2222
uint8_t weekday; ///< The day of the week.
2323
uint8_t day; ///< The day of the month.
24+
25+
/// @brief Equality operator.
26+
/// @param other The other date.
27+
/// @return True if equal, false otherwise.
28+
bool operator==(const Date &other) const {
29+
return year == other.year && month == other.month && weekday == other.weekday &&
30+
day == other.day;
31+
}
32+
33+
/// @brief Inequality operator.
34+
/// @param other The other date.
35+
/// @return True if not equal, false otherwise.
36+
bool operator!=(const Date &other) const { return !(*this == other); }
2437
};
2538

2639
/// @brief The time structure.
2740
struct Time {
2841
uint8_t hour; ///< The hour.
2942
uint8_t minute; ///< The minute.
3043
uint8_t second; ///< The second.
44+
45+
/// @brief Equality operator.
46+
/// @param other The other time.
47+
/// @return True if equal, false otherwise.
48+
bool operator==(const Time &other) const {
49+
return hour == other.hour && minute == other.minute && second == other.second;
50+
}
51+
52+
/// @brief Inequality operator.
53+
/// @param other The other time.
54+
/// @return True if not equal, false otherwise.
55+
bool operator!=(const Time &other) const { return !(*this == other); }
3156
};
3257

3358
/// @brief The date and time structure.
3459
struct DateTime {
3560
Date date; ///< The date.
3661
Time time; ///< The time.
62+
63+
/// @brief Equality operator.
64+
/// @param other The other date and time.
65+
/// @return True if equal, false otherwise.
66+
bool operator==(const DateTime &other) const {
67+
return date == other.date && time == other.time;
68+
}
69+
70+
/// @brief Inequality operator.
71+
/// @param other The other date and time.
72+
/// @return True if not equal, false otherwise.
73+
bool operator!=(const DateTime &other) const { return !(*this == other); }
3774
};
3875

3976
/// @brief The configuration structure.
@@ -180,32 +217,6 @@ class Bm8563 : public BasePeripheral<> {
180217
};
181218
} // namespace espp
182219

183-
/// @brief Compare two Date objects.
184-
/// @param lhs The left hand side.
185-
/// @param rhs The right hand side.
186-
/// @return True if the objects are equal.
187-
[[maybe_unused]] static bool operator==(const espp::Bm8563::Date &lhs,
188-
const espp::Bm8563::Date &rhs) {
189-
return lhs.year == rhs.year && lhs.month == rhs.month && lhs.weekday == rhs.weekday &&
190-
lhs.day == rhs.day;
191-
}
192-
193-
/// @brief Compare two Time objects.
194-
/// @param lhs The left hand side.
195-
/// @param rhs The right hand side.
196-
[[maybe_unused]] static bool operator==(const espp::Bm8563::Time &lhs,
197-
const espp::Bm8563::Time &rhs) {
198-
return lhs.hour == rhs.hour && lhs.minute == rhs.minute && lhs.second == rhs.second;
199-
}
200-
201-
/// @brief Compare two DateTime objects.
202-
/// @param lhs The left hand side.
203-
/// @param rhs The right hand side.
204-
/// @return True if the objects are equal.
205-
[[maybe_unused]] static bool operator==(const espp::Bm8563::DateTime &lhs,
206-
const espp::Bm8563::DateTime &rhs) {
207-
return lhs.date == rhs.date && lhs.time == rhs.time;
208-
}
209220
// for allowing easy serialization/printing of the
210221
// espp::Bm8563::Date, espp::Bm8563::Time, and espp::Bm8563::DateTime
211222
template <> struct fmt::formatter<espp::Bm8563::Date> {

components/chsc6x/include/chsc6x.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
namespace espp {
99
/// @brief Driver for the Chsc6x touch controller
1010
///
11-
/// \section Example
11+
/// \section chsc6x_ex1 Example
1212
/// \snippet chsc6x_example.cpp chsc6x example
1313
class Chsc6x : public BasePeripheral<> {
1414
public:

components/cst816/include/cst816.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace espp {
1616
/// here:
1717
/// https://github.com/espressif/esp-bsp/tree/master/components/lcd_touch/esp_lcd_touch_cst816s
1818
///
19-
/// \section Example
19+
/// \section cst816_ex1 Example
2020
/// \snippet cst816_example.cpp cst816 example
2121
class Cst816 : public BasePeripheral<std::uint8_t> {
2222
public:

components/display_drivers/include/gc9a01.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ class Gc9a01 {
238238

239239
/**
240240
* @brief Flush the pixel data for the provided area to the display.
241-
* @param *drv Pointer to the LVGL display driver.
241+
* @param *disp Pointer to the LVGL display.
242242
* @param *area Pointer to the structure describing the pixel area.
243243
* @param *color_map Pointer to array of colors to flush to the display.
244244
*/
@@ -292,10 +292,10 @@ class Gc9a01 {
292292
}
293293

294294
/**
295-
* @brief Flush the pixel data for the provided area to the display.
296-
* @param *drv Pointer to the LVGL display driver.
295+
* @brief Fill the display area with the provided color map.
296+
* @param *disp Pointer to the LVGL display.
297297
* @param *area Pointer to the structure describing the pixel area.
298-
* @param *color_map Pointer to array of colors to flush to the display.
298+
* @param *color_map Pointer to array of colors to fill the display with.
299299
* @param flags uint32_t user data / flags to pass to the lcd_write transfer function.
300300
*/
301301
static void fill(lv_display_t *disp, const lv_area_t *area, uint8_t *color_map,

components/display_drivers/include/ili9341.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ class Ili9341 {
168168

169169
/**
170170
* @brief Flush the pixel data for the provided area to the display.
171-
* @param *drv Pointer to the LVGL display driver.
171+
* @param *disp Pointer to the LVGL display.
172172
* @param *area Pointer to the structure describing the pixel area.
173173
* @param *color_map Pointer to array of colors to flush to the display.
174174
*/
@@ -222,8 +222,8 @@ class Ili9341 {
222222
}
223223

224224
/**
225-
* @brief Flush the pixel data for the provided area to the display.
226-
* @param *drv Pointer to the LVGL display driver.
225+
* @brief Fill the display area with the provided color map.
226+
* @param *disp Pointer to the LVGL display.
227227
* @param *area Pointer to the structure describing the pixel area.
228228
* @param *color_map Pointer to array of colors to flush to the display.
229229
* @param flags uint32_t user data / flags to pass to the lcd_write transfer function.

components/display_drivers/include/sh8601.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ class Sh8601 {
182182

183183
/**
184184
* @brief Flush the pixel data for the provided area to the display.
185-
* @param *drv Pointer to the LVGL display driver.
185+
* @param *disp Pointer to the LVGL display.
186186
* @param *area Pointer to the structure describing the pixel area.
187187
* @param *color_map Pointer to array of colors to flush to the display.
188188
*/

0 commit comments

Comments
 (0)