Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merging anya and ken branches #119

Draft
wants to merge 62 commits into
base: main
Choose a base branch
from
Draft

merging anya and ken branches #119

wants to merge 62 commits into from

Commits on Jul 6, 2022

  1. feat: starting work on actuator class

    Anya Emerson authored and Anya Emerson committed Jul 6, 2022
    Configuration menu
    Copy the full SHA
    b7290a4 View commit details
    Browse the repository at this point in the history
  2. feat: starting work on actuator class

    Anya Emerson authored and Anya Emerson committed Jul 6, 2022
    Configuration menu
    Copy the full SHA
    47c89b4 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'actuator_pump' of https://github.com/emersonae/rriv int…

    …o actuator_pump
    Anya Emerson authored and Anya Emerson committed Jul 6, 2022
    Configuration menu
    Copy the full SHA
    c834485 View commit details
    Browse the repository at this point in the history
  4. fix: change getconfiguration to return config json, comment out enoug…

    …h code (commands, serial messages) to fit co2 sensor driver
    kenchong48 committed Jul 6, 2022
    Configuration menu
    Copy the full SHA
    d3e7226 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    5d252df View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2022

  1. Configuration menu
    Copy the full SHA
    3a3852b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    46061b8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4249a10 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2022

  1. Configuration menu
    Copy the full SHA
    97d9c47 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2022

  1. fix: enable summary clear on burst start, implement summary for all d…

    …rivers
    Zaven Arra authored and kenchong48 committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    379eafb View commit details
    Browse the repository at this point in the history
  2. fix: change getconfiguration to return config json, comment out enoug…

    …h code (commands, serial messages) to fit co2 sensor driver
    kenchong48 committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    9727249 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2022

  1. Configuration menu
    Copy the full SHA
    7d4d558 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2022

  1. feat: implement warmup functions in CO2 and DHT22 drivers, and check …

    …in datalogger loop; fix human timestamp; hardcode battery to exADC port 3, reimplement sensor reading interval and functions, implement rtc set time and diff delay when setting
    kenchong48 committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    d24a95f View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2022

  1. Configuration menu
    Copy the full SHA
    f87b3d0 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2022

  1. adding all changes 8/11

    Anya Emerson authored and Anya Emerson committed Aug 11, 2022
    Configuration menu
    Copy the full SHA
    1465f1e View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2022

  1. fix: subtract the amount of time a reading takes from the inter readi…

    …ng delay, subtract the amount of time a burst cycle takes from the inter burst delay, correct the sensor warmup loop
    kenchong48 committed Aug 19, 2022
    Configuration menu
    Copy the full SHA
    ee9c9d3 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2022

  1. Actutator Drivers working

    emersonae committed Sep 9, 2022
    Configuration menu
    Copy the full SHA
    ab7376e View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2022

  1. Configuration menu
    Copy the full SHA
    3a741e8 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2022

  1. fix: add code to handle if no sensor provides a requested reading del…

    …ay and TODO to clean up the logic later
    kenchong48 committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    88f4c28 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2022

  1. feat: improve debug to file feature when deployed

    Zaven Arra committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    4ea2e9b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d09dad8 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #2 from ZavenArra/debugToFile

    Debug to file
    kenchong48 committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    b9eaa13 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9eaad53 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2022

  1. fix: memory leak in drivers (stop functions need delete), lowered fla…

    …sh memory consumption of messages, debug to file enabled, potentially final code for deployments
    kenchong48 committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    97e025c View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2022

  1. Configuration menu
    Copy the full SHA
    3b16437 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2022

  1. Configuration menu
    Copy the full SHA
    79b2ed7 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2022

  1. Configuration menu
    Copy the full SHA
    5f4f528 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2023

  1. fix: time entry error for the DS3231 RTC fixed, note not enough space…

    … to use built in function, so modified current one.
    kenchong48 committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    ea7a18b View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2023

  1. 3/3/23

    emersonae committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    fe995ae View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    aa521fd View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2023

  1. AHTX0 added

    emersonae committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    eb565f8 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2023

  1. fix: looking into an issue where the rtc set time variable is not set…

    …, it might be a hardware issue though
    kenchong48 committed Mar 31, 2023
    Configuration menu
    Copy the full SHA
    2d97de9 View commit details
    Browse the repository at this point in the history
  2. feat: initial lines for continuous power mode modifying stopAndAwaitT…

    …rigger(), allows methane sensor to be powered and heated while sleeping. Need a command to toggle the mode
    kenchong48 committed Mar 31, 2023
    Configuration menu
    Copy the full SHA
    c12cab5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f16e8e7 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    213d134 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2023

  1. Configuration menu
    Copy the full SHA
    c725b38 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2023

  1. aht_v2

    emersonae committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    ab4860b View commit details
    Browse the repository at this point in the history
  2. aht_v3

    emersonae committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    fd7532a View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2023

  1. Configuration menu
    Copy the full SHA
    b861b59 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2023

  1. fix: trying to get continuous power to never turn off power, but ther…

    …e's a 500 millisecond delay when restarting for the adc. I've disabled it here, but the code crashes on operation
    kenchong48 committed Apr 24, 2023
    Configuration menu
    Copy the full SHA
    46c7dd4 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2023

  1. Configuration menu
    Copy the full SHA
    c7e50b7 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2023

  1. Configuration menu
    Copy the full SHA
    29d4557 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e45e616 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2023

  1. Configuration menu
    Copy the full SHA
    18fe84b View commit details
    Browse the repository at this point in the history

Commits on May 24, 2023

  1. Update platformio.ini

    emersonae committed May 24, 2023
    Configuration menu
    Copy the full SHA
    d22c007 View commit details
    Browse the repository at this point in the history
  2. Update adafruit_ahtx0.cpp

    emersonae committed May 24, 2023
    Configuration menu
    Copy the full SHA
    b2f0032 View commit details
    Browse the repository at this point in the history
  3. Update registry.cpp

    emersonae committed May 24, 2023
    Configuration menu
    Copy the full SHA
    bfb587d View commit details
    Browse the repository at this point in the history
  4. working ver 5/24

    emersonae committed May 24, 2023
    Configuration menu
    Copy the full SHA
    41a806b View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2023

  1. Configuration menu
    Copy the full SHA
    df34ae1 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2023

  1. merge

    jdh authored and jdh committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    b9ec88e View commit details
    Browse the repository at this point in the history
  2. fix: merge_branches

    jdh authored and jdh committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    eecd30a View commit details
    Browse the repository at this point in the history
  3. adding rgb driver

    jdh authored and jdh committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    0c0c863 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2023

  1. adding rgb sensor

    jdh authored and jdh committed Jul 8, 2023
    Configuration menu
    Copy the full SHA
    e832587 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. modifying interburstdelay to seconds

    jdh committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    d9b314d View commit details
    Browse the repository at this point in the history
  2. turning off continuous power

    jdh committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    9dc8ab5 View commit details
    Browse the repository at this point in the history
  3. reverting warmup time

    jdh authored and jdh committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    d260d59 View commit details
    Browse the repository at this point in the history
  4. fixing previous push

    jdh authored and jdh committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    05b1ed6 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2023

  1. fix RTC issue

    jdh authored and jdh committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    b6d721c View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2023

  1. fixing timing for certain sensors

    jdh authored and jdh committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    f280871 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2023

  1. creating #def for continuous power

    jdh authored and jdh committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    6b6e086 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. adding ch4 build

    jdh committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    e1d7cf8 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2023

  1. adding new envs

    ecosystemscience committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    4de2bc3 View commit details
    Browse the repository at this point in the history