Skip to content

Commit

Permalink
Merge pull request #171 from sparkfun/main
Browse files Browse the repository at this point in the history
Bring development up to date
  • Loading branch information
gigapod authored Jul 23, 2024
2 parents 8792f1a + f0b9f46 commit 4a6b8f6
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 1 deletion.
64 changes: 64 additions & 0 deletions .github/workflows/build-deploy-ghpages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: Build Documentation and Deploy

on:
push:
branches:
- main
workflow_dispatch:

permissions:
contents: read
id-token: write
pages: write

concurrency:
group: "pages"
cancel-in-progress: true

jobs:
# Build job
build:
runs-on: ubuntu-latest
steps:
# Checkout the repository
- name: Checkout repository
uses: actions/checkout@v2
with:
fetch-depth: 0
submodules: "true"

- name: Set Version
run: echo "PROJECT_NUMBER = `git describe --tags`" >> ./docs/doxygen/doxygen-config

- name: Build Documentation
uses: mattnotmitt/[email protected]
with:
doxyfile-path: "./docs/doxygen/doxygen-config"

# Upload the documentation as an artifact
- name: Upload documentation
uses: actions/[email protected]
with:
path: ./docs/html

# Deploy job
deploy:
# Add a dependency to the build job
needs: build

# Grant GITHUB_TOKEN the permissions required to make a Pages deployment
permissions:
pages: write # to deploy to Pages
id-token: write # to verify the deployment originates from an appropriate source

# Deploy to the github-pages environment
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}

# Specify runner + deployment step
runs-on: ubuntu-latest
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4 # or specific "vX.X.X" version tag for this action
2 changes: 1 addition & 1 deletion docs/doxygen/doxygen-config
Original file line number Diff line number Diff line change
Expand Up @@ -1227,7 +1227,7 @@ USE_HTAGS = NO
# See also: Section \class.
# The default value is: YES.

VERBATIM_HEADERS = YES
VERBATIM_HEADERS = NO

#---------------------------------------------------------------------------
# Configuration options related to the alphabetical class index
Expand Down
3 changes: 3 additions & 0 deletions src/iot/iot_arduino/flxIoTArduino.h
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,10 @@ class DataLoggerAIOTConnectionHandler : public ConnectionHandler
///
typedef struct
{
/// @brief The type of the variable
flxDataType_t type;

/// @brief The variable itself - from the ArduinoIoTCloud library
void *variable;
} flxIoTArduinoVar_t;

Expand Down

0 comments on commit 4a6b8f6

Please sign in to comment.