Skip to content

Fixed bugs and updated LSM303 Library #4

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.

Sign up for GitHub

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

Open
jsonpoindexter wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fixed bugs and updated LSM303 Library #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e43d297
Added 32bit LSM303 library to work with Teensy3.0/3.1 and possibly ot…
May 16, 2015
12033e6
Updated LSM303 Library
jsonpoindexter Oct 11, 2017
19d8ad0
Fixed breathe() crashing due to stip scope
jsonpoindexter Oct 11, 2017
53afcc0
Update hermes.ino
jsonpoindexter Oct 11, 2017
bf76553
Constrain color scale so we dont get 0 as LED color
jsonpoindexter Jul 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Adafruit_LSM303DLHC
Open in desktop
Submodule Adafruit_LSM303DLHC added at 3adbf0
114 changes: 0 additions & 114 deletions Adafruit_LSM303_Old/Adafruit_LSM303_Old.cpp
View file
Open in desktop

This file was deleted.

124 changes: 0 additions & 124 deletions Adafruit_LSM303_Old/Adafruit_LSM303_Old.h
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions Adafruit_LSM303_Old/README.md
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions Adafruit_LSM303_Old/examples/Test/Test.ino
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions Adafruit_Sensor
Open in desktop
Submodule Adafruit_Sensor added at e985f2
18 changes: 10 additions & 8 deletions hermes/hermes.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
// Raising this raises the vector magnitude needed to reach max (purple),
// and thus lowers sensitivity.
// Eg: 800 = more sensitive, 1600 = less sensitive
#define HERMES_SENSITIVITY 1600.0
#define HERMES_SENSITIVITY 3200.0
// Emulate two strips by starting the crawl in the
// middle of the strip and crawling both ways.
#define ENABLE_SPLIT_STRIP 1
Expand All @@ -48,8 +48,6 @@
// Accel imports.
#include <Wire.h>
#include <Adafruit_LSM303_Old.h>

// Our custom data type.
#include "AccelReading.h"

void setup() {
Expand Down Expand Up @@ -147,9 +145,12 @@ unsigned long lastSignificantMovementTime;
// Initialization.
void accelSetup() {
Serial.println("BEGIN");


lsm.begin();

// Try to initialise and warn if we couldn't detect the chip
if (!lsm.begin()) {
Serial.println("Unable to initialize the LSM303. Check your wiring!");
}
bufferPosition = 0;

// Initialize the full buffer to zero.
Expand Down Expand Up @@ -351,7 +352,7 @@ bool equalReadings(AccelReading a, AccelReading b) {
// color //
///////////

int COLOR_RANGE = 384;
int COLOR_RANGE = 383;
uint32_t lastColor;
unsigned long lastCrawl;
uint32_t lightArray[LED_COUNT];
Expand Down Expand Up @@ -386,7 +387,7 @@ void updateLED() {
//showColor(scale);

if (sleep()) {
breathe(strip);
breathe();
} else {
crawlColor(pixelColor);
}
Expand Down Expand Up @@ -481,6 +482,7 @@ void showColor(float scale) {
// Takes a scale, from 0.0 to 1.0, indicating progression
// through the color rainbow.
uint32_t pixelColorForScale(double scale) {
scale = max(min(scale, 1), 0);
float brightness = MAX_BRIGHTNESS * (scale + MIN_BRIGHTNESS);
int c = COLOR_RANGE * scale; // Intentionally round to an int.

Expand Down Expand Up @@ -636,7 +638,7 @@ void resetBreathe() {
keyframePointer = 0;
}

void breathe(Adafruit_NeoPixel strip) {
void breathe() {
int numKeyframes = sizeof(KEYFRAMES) - 1;
float period = SLEEP_CYCLE_MS / numKeyframes;
unsigned long now = millis();
Expand Down