Skip to content

Commit a66719b

Browse files
committed
further work on docs - org an structure of markdown pages
1 parent 7b0a51a commit a66719b

19 files changed

+172
-152
lines changed

docs/act_sysfirmware.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# System Reset and Firmware Update Action - ESP32
1+
# Firmware Update - ESP32 {#flux-using-esp32-firmware}
22

33
> *ESP32*
44
@@ -26,7 +26,6 @@ When this option is selected, the user is presented a prompt to continue. To lau
2626

2727
![Restart Prompt](images/act_sysfirm_restart.png)
2828

29-
3029
## Factory Reset
3130

3231
A factory reset will move the boot firmware of the device to the firmware imaged installed at the ***factory*** and erase any on-board stored settings on the device. This is helpful if an update fails, or an update has issues that prevent proper operations.
@@ -180,7 +179,7 @@ The `VersionNumber` field is often created by the following formula:
180179
versionNumber = Major_Version * 10000 + Minor_Version * 100 + Point_Version
181180
```
182181

183-
#### MD5 Hash Creation
182+
#### MD5 Hash Creation
184183

185184
The following command are used to create an MD5 hash value
186185

@@ -201,5 +200,3 @@ Windows - using `Power Shell`
201200
```
202201
Get-FileHash <firmware file> -Algorithm MD5
203202
```
204-
205-

docs/ar_autoload.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Device Detection and Loading {#device_detection_loading}
1+
# I2C Device Detection {#device_detection_loading}
22

33
One of the key features of the Flux framework is the ability to automatically detect and load different I2C devices, while placing minimal requirements on the device driver developer.
44

docs/build_with_flux.md

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

2-
# Building with Flux
2+
# Building with Flux {#building-with-flux}
33

4-
This section outline the steps needed to support Flux in an Arduino Build Environment. Both support for Arduino IDE development, as well as automated builds that use the Arduino CLI (GitHub actions).
4+
This section outline the steps needed to support Flux in an Arduino Build Environment. Both support for Arduino IDE development, as well as automated builds that use the Arduino CLI (GitHub actions).
55

6-
Since Flux is private, only available to SparkFun employees and approved partners, the build integration is different from standard Open Source projects.
6+
Since Flux is private, only available to SparkFun employees and approved partners, the build integration is different from standard Open Source projects.
77

88
## Using Flux within the Arduino IDE
99

@@ -31,9 +31,9 @@ To use Flux in another project that is being build using build automation (GitHu
3131
git submodule add [email protected]:sparkfun/SparkFun_Flux.git
3232
```
3333

34-
With this structure in place, access to the Flux within a GitHub action is accomplished by using ssh keys.
34+
With this structure in place, access to the Flux within a GitHub action is accomplished by using ssh keys.
3535

36-
The first step is to generate a new key locally - in a shell
36+
The first step is to generate a new key locally - in a shell
3737

3838
```sh
3939
ssh-keygen -t rsa -b 4096 -C "Access to flux"
@@ -47,11 +47,11 @@ Next add the public part of the key to the Flux repo as a deploy key. In the Flu
4747

4848
Give the key a descriptive name (***my project access key***) and paste the public part of the key into the dialog. Keep the key read-only.
4949

50-
The next step is to add the private part of the key as a ***secret*** in main project (the project using flux) github repository. This is done in ```Settings > Secrets and variables > Actions``` page. On this page, on the **Secrets** tab, select the ***New repository secret*** button.
50+
The next step is to add the private part of the key as a ***secret*** in main project (the project using flux) github repository. This is done in ```Settings > Secrets and variables > Actions``` page. On this page, on the **Secrets** tab, select the ***New repository secret*** button.
5151

5252
![Action Secret](images/github_action_secret.png)
5353

54-
In the provided dialog, enter a name for the secret (follow variable naming methodology) and set the value to the private portion of the generated key.
54+
In the provided dialog, enter a name for the secret (follow variable naming methodology) and set the value to the private portion of the generated key.
5555

5656
## Download the Flux Submodule
5757

@@ -73,10 +73,9 @@ Within a github action, the key is used to download the Flux submodule. Once the
7373
7474
NOTE: In this example, ```FLUX_PULL_KEY_2``` is the name of the Flux key secret within this repository.
7575

76-
7776
Once the Flux submodule is checked out, the application is setup and built using the Arduino Command Line (```arduino-cli```)
7877

79-
## Using Arduino CLI
78+
## Using Arduino CLI
8079

8180
### Installation
8281

@@ -100,11 +99,11 @@ If working within a github action, the following code will install and setup the
10099
run: arduino-cli core install esp32:esp32
101100
```
102101

103-
Note: The above example also installed the ESP32 platform
102+
Note: The above example also installed the ESP32 platform
104103

105104
### Install Flux Dependencies
106105

107-
The Flux repository includes a script that installs all library dependencies using the ```arduino-cli```. This command, ```install-libs.sh``` is located within the root directory of the Flux repository.
106+
The Flux repository includes a script that installs all library dependencies using the ```arduino-cli```. This command, ```install-libs.sh``` is located within the root directory of the Flux repository.
108107

109108
To run this command within a github Action, the following code is used:
110109

@@ -114,13 +113,13 @@ To run this command within a github Action, the following code is used:
114113
run: ./SparkFun_Flux/install-libs.sh
115114
```
116115

117-
Note: The above command assumes Flux is installed in the root directory of the repository. Adjust the command path to the structure of your repository if needed.
116+
Note: The above command assumes Flux is installed in the root directory of the repository. Adjust the command path to the structure of your repository if needed.
118117

119118
### Compile and Build
120119

121120
Once all the dependencies are installed, the ```arduino-cli compile``` option is called to build the desired application. To use Flux as a library, the ```--library``` switch is used with the compile call.
122121

123-
The following is an example of building an ESP32 based sketch, which uses the Flux library.
122+
The following is an example of building an ESP32 based sketch, which uses the Flux library.
124123

125124
Note that the location of the Flux library is passed in using the ```--library'`` switch, and that the ***full*** path to the Flux directory is provided. Using a relative path to the Flux library directory causes this command to fail
126125

@@ -145,4 +144,4 @@ For reference, once the above compile command is completed, the resultant Firmwa
145144
with:
146145
name: SparkFun_DataLoggerIoT.bin
147146
path: sfeDataLoggerIoT/build/esp32.esp32.esp32/SparkFun_DataLoggerIoT.bin
148-
```
147+
```

docs/device_writing.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ The return value should be one of the following:
111111
|```flxDevConfidenceFuzzy``` | The algorithm has high-confidence in a match, but it's not exact|
112112
|```flxDevConfidencePing``` | An address "ping" is used - just detecting a device at a location, but not verifying the device type.|
113113
114-
> Note: Only one device with a PING confidence is allowed at an address.
114+
> [!note]
115+
>
116+
> Only one device with a PING confidence is allowed at an address.
115117
116118
#### Example Method Definition
117119
@@ -174,9 +176,6 @@ Where `DeviceClassName` is the class name of the device being registered.
174176
175177
Once a device is registered, it is available for auto-detection and loading by the framework during the startup process of system.
176178
177-
> ![note]
178-
> The ```flxRegisterDevice()``` call is a macro that defines a global object using a c++ template. The object is instantiated on system startup (all globals are), and in the constructor of the object, it registers itself with the device discovery system.
179-
180179
Building off the above BME280 example, the implementation looks like:
181180
182181
```cpp
@@ -253,6 +252,7 @@ bool flxDevBME280::onInitialize(TwoWire &wirePort)
253252
```
254253
255254
> [!note]
255+
>
256256
> The ```address()``` method returns the device address for this instance of the driver.
257257
258258
### Determining if a Device is Initialized

docs/devices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Devices
1+
# Available Devices {#flux-available-devices}
22

33
Supported devices are:
44

docs/doxygen/doxygen-config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -950,6 +950,9 @@ WARN_LOGFILE =
950950
# Note: If this tag is empty the current directory is searched.
951951

952952
INPUT = docs/flux.dox \
953+
docs/flux_using.md \
954+
docs/flux_developing.md \
955+
docs/flux_architecture.md \
953956
docs \
954957
src \
955958
README.md

docs/flux_architecture.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Flux Architecture {#framework_architecture}
2+
3+
* @subpage device_detection_loading
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
# Framework Development {#framework_development}
1+
# Flux Development {#framework_development}
22

33
* @subpage properties_overview
44
* @subpage parameters_overview
55
* @subpage writing_a_device_class
6-
* @subpage device_detection_loading

docs/flux_using.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Using Flux {#flux-using}
2+
3+
* @subpage building-with-flux
4+
* @subpage flux-using-iot
5+
* @subpage flux-available-devices
6+
* @subpage flux-using-esp32

docs/flux_using_esp32.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Using Flux on ESP32 {#flux-using-esp32}
2+
3+
* @subpage flux-using-esp32-firmware

0 commit comments

Comments
 (0)