Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: BrendonWatsonLab/phoBehavioralBoxLabjackController
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: BrendonWatsonLab/phoBehavioralBoxLabjackController
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: noahtime
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 12 commits
  • 47 files changed
  • 3 contributors

Commits on Jun 17, 2021

  1. Changed version number to 1.0.1.4

    @CommanderPho
    CommanderPho committed Jun 17, 2021
    Configuration menu
    Copy the full SHA
    72b19f8 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2022

  1. David's Stamp 

    This is kind of like David's stamp that this version indeed works for the BBs as of right now. THIS IS THE REAL BEHAVIORAL BOX CODE THAT WORKS
    @CommanderPho
    CommanderPho committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    8294849 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2022

  1. Analog Write Frequency Changes 

    David and Deniz's ultimate tag team efforts made the analog data file writing frequency 16.67 Hz and toggleable to 25 or 8 hz.
    @CommanderPho
    CommanderPho committed May 10, 2022
    Configuration menu
    Copy the full SHA
    35812d5 View commit details
    Browse the repository at this point in the history

  2. Updated the Version Number(same code as before) 

    Exactly what the commit title says
    @CommanderPho
    CommanderPho committed May 10, 2022
    Configuration menu
    Copy the full SHA
    0961fd2 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2023

  1. Cutting down files 

    Deleted several files that were directly related to historical data and web server stuff, which we don't need at the moment
    @noahmuscat
    noahmuscat committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    453978d View commit details
    Browse the repository at this point in the history

  2. Cut out server and historical data from controllers manager 

    Main concern is if historical data really means the data gathered from labjack. If that's the case, all of these cuts will have to be undone.
    @noahmuscat
    noahmuscat committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    f00892c View commit details
    Browse the repository at this point in the history

  3. More deletes and edits 

    Cutting out more files and editing others. Minor changes to the config file and the labjack file, but all others cut completely. I believe all widget files are directly related to the web server.
    @noahmuscat
    noahmuscat committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    d77371e View commit details
    Browse the repository at this point in the history

  4. New version number (1.0.2.0) 

    With such drastic changes, I feel we may need to move all the way to version 1.0.2.x
    @noahmuscat
    noahmuscat committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    67aaed1 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2023

  1. Commented out deleted files 

    Might need to do more of this?
    @noahmuscat
    noahmuscat committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    308600e View commit details
    Browse the repository at this point in the history

  2. Small edit in main 

    More deleting of web server/historical data stuff
    @noahmuscat
    noahmuscat committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    6c64544 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2023

  1. MORE CUTS 

    All device info vcxproj
    @noahmuscat
    noahmuscat committed Feb 16, 2023
    Configuration menu
    Copy the full SHA
    31c40e1 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2023

  1. Hacking away more stuff and cleaning 

    should compile now... I hope... I don't think it will, but one can pray, amirite? I mean... It compiled on David's personal laptop...
    @davskim
    davskim committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    af8ba98 View commit details
    Browse the repository at this point in the history
Loading