Skip to content

Commit 54b4c9f

Browse files
committed
continued work on docs concept
1 parent 6b58adc commit 54b4c9f

File tree

10 files changed

+45
-20
lines changed

10 files changed

+45
-20
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2+
docs/html/

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "docs/doxygen/doxygen-awesome-css"]
2+
path = docs/doxygen/doxygen-awesome-css
3+
url = https://github.com/jothepro/doxygen-awesome-css.git

docs/doxygen/doxygen-config

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -949,9 +949,10 @@ WARN_LOGFILE =
949949
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
950950
# Note: If this tag is empty the current directory is searched.
951951

952-
INPUT = src \
953-
README.md \
954-
docs
952+
INPUT = docs/flux.dox \
953+
docs \
954+
src \
955+
README.md
955956

956957
# This tag can be used to specify the character encoding of the source files
957958
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -2466,7 +2467,7 @@ HIDE_UNDOC_RELATIONS = YES
24662467
# set to NO
24672468
# The default value is: NO.
24682469

2469-
HAVE_DOT = YES
2470+
HAVE_DOT = NO
24702471

24712472
# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
24722473
# to run in parallel. When set to 0 doxygen will base this on the number of

docs/doxygen/doxygen-custom/header.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<body>
3939

4040
<!-- https://tholman.com/github-corners/ -->
41-
<a href="https://github.com/sparkfun/SparkFun_Toolkit" class="github-corner" title="View source on GitHub">
41+
<a href="https://github.com/sparkfun/flux-sdk" class="github-corner" title="View source on GitHub">
4242
<svg viewBox="0 0 250 250" style="position: absolute; top: 0; border: 0; right: 0;" aria-hidden="true">
4343
<path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path>
4444
<path

docs/flux.dox

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/**
2+
* @defgroup core Core
3+
@brief Core Module of the SDK
4+
*/
5+
6+
/**
7+
* @defgroup module_properties Properties
8+
@brief Using and developing with object properties
9+
* @ingroup core
10+
*/
11+
12+
13+
/**
14+
* @defgroup property_rw_classes Read/Write Property Classes
15+
* @brief Read/Write Property Class Definitions
16+
* @ingroup module_properties
17+
*/
18+
19+
/**
20+
* @defgroup property_classes Property Classes
21+
@brief Property Class Definitions
22+
* @ingroup module_properties
23+
*/

docs/properties.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
\defgroup module_properties Properties
1+
\addtogroup module_properties
22
@{
33

44
# Properties
@@ -7,7 +7,7 @@ Properties represent the "_settings_" for a particular object within the system.
77

88
It's worth noting that properties don't reflect the input or output data from an object within the framework - this managed by _parameter_ objects.
99

10-
### Property Attributes
10+
## Property Attributes
1111

1212
The following are key attributes of properties within the framework
1313

@@ -17,7 +17,7 @@ The following are key attributes of properties within the framework
1717
* Property objects can act like a variable
1818
* Property objects allow introspection - they can be discovered and manipulated at runtime via software
1919

20-
#### Property Types
20+
### Property Types
2121

2222
The following types are available for properties
2323

@@ -178,7 +178,7 @@ Where:
178178
* flxPropertyRWBool - bool property
179179
* flxPropertyRWInt8 - integer 8 property
180180
* flxPropertyRWInt16 - integer 16 property
181-
* flxPropertyRWInt32 - integer 32 property
181+
* flxPropertyRWInt32 - integer3 property
182182
* flxPropertyRWUInt8 - unsigned 8 integer
183183
* flxPropertyRWUInt16 - unsigned 16 integer
184184
* flxPropertyRWUInt32 - unsigned 32 integer

src/core/flux_base/flxCoreProps.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -716,10 +716,8 @@ class _flxPropertyTypedRW : public _flxPropertyBase<T, HIDDEN, SECURE>
716716

717717
// Create typed read/writer property objects - type and RW objects as super classes
718718
/**
719-
* @defgroup property_rw_classes Read/Write Property Classes
720-
*
719+
* @addtogroup property_rw_classes
721720
* @{
722-
* @ingroup module_properties
723721
*/
724722

725723
/**
@@ -1615,10 +1613,8 @@ class _flxPropertyTyped : public _flxPropertyBase<T, HIDDEN, SECURE>
16151613
// Define typed properties
16161614

16171615
/**
1618-
* @defgroup property_classes Property Classes
1619-
*
1616+
* @addtogroup property_classes
16201617
* @{
1621-
* @ingroup module_properties
16221618
*/
16231619

16241620
/**

src/core/flux_base/flxCoreTypes.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class flxDescriptor
5151
* @brief Set the Name object - storing the pointer to the provided string No allocation is
5252
* performed. If the previous name was allocated, it is freed.
5353
*
54-
* @param new_name[in] The new name for the object
54+
* @param[in] new_name The new name for the object
5555
*/
5656

5757
void setName(const char *new_name)
@@ -1023,7 +1023,7 @@ class flxDataOut
10231023
* @param bool value
10241024
* @return value as a bool
10251025
*/
1026-
bool get_value(bool)
1026+
bool get_value(bool b)
10271027
{
10281028
return getBool();
10291029
}

src/core/flux_base/flxUtils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,8 +430,8 @@ void flx_utils::formatByteString(uint64_t nBytes, uint prec, char *szBuffer, siz
430430
/// createVariableName()
431431
///
432432
/// @brief Creates a valid arduino variable name
433-
/// @param[In] szInVariable the name to convert
434-
/// @param[Out] szOutVariable the converted name - assumed to same len as in variable.
433+
/// @param[in] szInVariable the name to convert
434+
/// @param[out] szOutVariable the converted name - assumed to same len as in variable.
435435
///
436436
/// @return true on success, false on failure
437437
///

src/iot/iot_arduino/flxIoTArduino.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ class DataLoggerAIOTConnectionHandler : public ConnectionHandler
204204
//
205205
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
206206

207-
/// @typedef flxIoTArduinoVar_t
207+
/// @struct flxIoTArduinoVar_t
208208
/// @brief Struct to hold a dynamically created Arduino Cloud variable
209209
///
210210
typedef struct

0 commit comments

Comments
 (0)