Found MCU Pinout

README.md

@@ -35,7 +35,7 @@ I have translated most of the original sample programs to the library here: http
 
    Be aware that this library is a work in progress.  In particular,<br>
 *  the accelerometer api will change
-*  power consumption ~~has not been optimized~~ [is about as good as it is going to get](https://github.com/dhiltonp/hexbright/tree/master/experiments/power_draw#optimizing-power-draw).
+*  power consumption has not been optimized ~~is about as good as it is going to get~~ [(see notes)](https://github.com/dhiltonp/hexbright/tree/master/experiments/power_draw#optimizing-power-draw).
 
 Enjoy!
 

experiments/power_draw/README.md

@@ -30,6 +30,18 @@ consumes 80-90% of the 5.4 mA in standby. This would vary based on the differenc
 I believe Christian put the power regulator at its point in order to prevent any power draw when the light is off,
 but as a consequence the standby time is 5-10x shorter than it would otherwise be.
 
+I need to run some numbers, calculating the difference between expected and observed power loss.
+
+Formula for power loss in the voltage regulator: [(4.2 - 3.3) * .500 + (4.2*.09)](http://en.wikipedia.org/wiki/Low-dropout_regulator#Efficiency_and_Heat_Dissipation)<br>
+.5 milliamps consumed by other components would cause a power loss of .83 milliamps, with 1.33 milliamps used<br>
+1 milliamp consumed, loss of 1.27 milliamps, 2.27 milliamps used<br>
+2 milliamps consumed, loss of 2.178, 4.178 milliamps used<br>
+3 milliamps consumed, loss of 3.078, 6.078 milliamps used<br>
+
+2.64 milliamps consumed, loss of 2.75 milliamps would be 5.4 milliamps used.
+We are probably powering about 2.64 milliamps. Lowering the power used for each device will roughly double the savings listed on the data sheet.
+
+
 Raw Data
 --------
 Recorded with a Fluke 287

hardware/hexbright/avr/boards.txt

@@ -0,0 +1,48 @@
+##############################################################
+
+hexbright.name=Hexbright
+
+hexbright.upload.protocol=arduino
+hexbright.upload.tool=arduino:avrdude
+hexbright.upload.maximum_size=14336
+hexbright.upload.maximum_data_size=1024
+hexbright.upload.speed=19200
+
+hexbright.bootloader.low_fuses=0xe2
+hexbright.bootloader.high_fuses=0xdd
+hexbright.bootloader.extended_fuses=0x00
+hexbright.bootloader.path=hexbright:atmega
+hexbright.bootloader.file=ATmegaBOOT_168_hexbright.hex
+hexbright.bootloader.unlock_bits=0x3F
+hexbright.bootloader.lock_bits=0x0F
+
+hexbright.build.mcu=atmega168
+hexbright.build.f_cpu=8000000L
+hexbright.build.core=arduino:arduino
+hexbright.build.variant=arduino:standard
+
+
+##############################################################
+
+hexbright_tiny.name=Hexbright Tinyboot
+
+hexbright_tiny.upload.protocol=arduino
+hexbright_tiny.upload.tool=arduino:avrdude
+hexbright_tiny.upload.maximum_size=15360
+hexbright_tiny.upload.maximum_data_size=1024
+hexbright_tiny.upload.speed=19200
+
+hexbright_tiny.bootloader.low_fuses=0xe2
+hexbright_tiny.bootloader.high_fuses=0xdd
+hexbright_tiny.bootloader.extended_fuses=0x02
+hexbright_tiny.bootloader.path=hexbright:atmega
+hexbright_tiny.bootloader.file=ATmegaBOOT_168_hexbright_tiny.hex
+hexbright_tiny.bootloader.unlock_bits=0x3F
+hexbright_tiny.bootloader.lock_bits=0x0F
+
+hexbright_tiny.build.mcu=atmega168p
+hexbright_tiny.build.f_cpu=8000000L
+hexbright_tiny.build.core=arduino:arduino
+hexbright_tiny.build.variant=arduino:standard
+
+

hb-examples/alarm_clock/alarm_clock.ino

@@ -1,5 +1,10 @@
+#include <print_power.h>
+#include <print_number.h>
+#include <input_digit.h>
+
+// These next two lines must come after all other library #includes
+#define BUILD_HACK
 #include <hexbright.h>
-#include <twi.h>
 #include <Time.h>
 
 hexbright hb;
@@ -35,14 +40,14 @@ void loop() {
       mode = SET_MODE;
       hb.set_light(0, 150, 300);
     }
-    if(!hb.printing_number()) {
-      hb.print_charge(GLED); 
+    if(!printing_number()) {
+      print_charge(GLED); 
     }
     break;
   case SET_MODE:
-    hb.input_digit(duration*10, duration*10+time[place]);
+    input_digit(duration*10, duration*10+time[place]);
     if(hb.button_just_released() && hb.button_pressed_time()<300) {
-      duration = hb.get_input_digit();
+      duration = get_input_digit();
       place++;
     }
     if(place==PLACES) {
@@ -60,9 +65,9 @@ void loop() {
       mode = WAKE_MODE;
     } else {
       // display our current wait time...
-      if(!hb.printing_number()) {
+      if(!printing_number()) {
         // print hours, and minutes remaining
-        hb.print_number(duration_remaining(duration));
+        print_number(duration_remaining(duration));
       } 
     }
     break;
@@ -80,4 +85,4 @@ int duration_remaining(int duration) {
     minutes_remaining+=60;
   }
   return hours_remaining*100+minutes_remaining;
-}
+}

hb-examples/down_light/down_light.ino

@@ -26,11 +26,12 @@ The views and conclusions contained in the software and documentation are those
 of the authors and should not be interpreted as representing official policies, 
 either expressed or implied, of the FreeBSD Project.
 */
+#include <print_power.h>
 
+// These next two lines must come after all other library #includes
+#define BUILD_HACK
 #include <hexbright.h>
 
-#include <twi.h>
-
 hexbright hb;
 
 void setup() {
@@ -73,5 +74,5 @@ void loop() {
        hb.set_light(CURRENT_LEVEL, 200, 50);
     } 
   }
-  hb.print_power();
-}
+  print_power();
+}

hb-examples/numeric_input/numeric_input.ino

@@ -1,5 +1,8 @@
+#include <input_digit.h>
+
+// These next two lines must come after all other library #includes
+#define BUILD_HACK
 #include <hexbright.h>
-#include <twi.h>
 
 hexbright hb;
 
@@ -16,14 +19,14 @@ unsigned int value = 0;
 void loop() {
   hb.update();
   if(hb.button_just_released() && hb.button_pressed_time()<300) { // on button press, we could do it based on whatever input signal we want.
-    value = hb.get_input_digit();
+    value = get_input_digit();
   } else if (hb.button_just_released()) {
-    value = hb.get_input_digit();
+    value = get_input_digit();
     hb.set_light(CURRENT_LEVEL, value<1 ? 1 : value, 300);
     value = 0;
   } else if (hb.button_just_pressed() && hb.button_released_time()<500) {
     hb.set_light(CURRENT_LEVEL, OFF_LEVEL, NOW);
     value = 0; 
   }
-  hb.input_digit(value*10, value*10+10);
-}
+  input_digit(value*10, value*10+10);
+}

hb-examples/stroboscope/stroboscope.ino

@@ -1,6 +1,9 @@
-// uncomment (delete // before) '#define STROBE' in hexbright.h
+#include <strobe.h>
+#include <print_number.h>
+
+// These next two lines must come after all other library #includes
+#define BUILD_HACK
 #include <hexbright.h>
-#include <twi.h>
 
 hexbright hb;
 
@@ -17,7 +20,7 @@ int mode = OFF_MODE;
 
 void loop() {
   hb.update();
-  
+
   if(mode==OFF_MODE) {
     if(hb.button_pressed_time()<200 && hb.button_just_released()) {
       fpm = 2000;
@@ -27,7 +30,7 @@ void loop() {
   if(mode==STROBE_MODE) {
     // turn off?
     if (hb.button_pressed_time()>200) {
-      hb.set_strobe_delay(STROBE_OFF); // if this line doesn't compile, uncomment STROBE in hexbright.h
+      set_strobe_delay(STROBE_OFF); // if this line doesn't compile, uncomment STROBE in hexbright.h
       hb.set_light(CURRENT_LEVEL, OFF_LEVEL, NOW);
       mode = OFF_MODE;
       return;
@@ -44,7 +47,7 @@ void loop() {
       } while (Serial.available()>0);
     if(buffer>0) {
       fpm = buffer;
-      hb.set_strobe_fpm(buffer);
+      set_strobe_fpm(buffer);
     }
 
     char spin = hb.get_spin();
@@ -54,13 +57,13 @@ void loop() {
       else
         fpm /= 1+spin/200.0; 
       //Serial.println(avg_spin);
-      hb.set_strobe_fpm(fpm);
+      set_strobe_fpm(fpm);
     }
 
-    if(!hb.printing_number()) {
-      Serial.println(hb.get_strobe_fpm());
-      Serial.println(hb.get_strobe_error());
-      hb.print_number(hb.get_strobe_fpm());
+    if(!printing_number()) {
+      Serial.println(get_strobe_fpm());
+      Serial.println(get_strobe_error());
+      print_number(get_strobe_fpm());
     }
   }
-}
+}

hb-examples/unplugged_action/unplugged_action.ino

@@ -1,5 +1,8 @@
+#include <print_power.h>
+
+// These next two lines must come after all other library #includes
+#define BUILD_HACK
 #include <hexbright.h>
-#include <twi.h>
 
 hexbright hb;
 
@@ -38,12 +41,12 @@ void loop() {
       mode=AUTO_OFF_MODE;
       auto_off_start_time=millis();
     } else { // flash LED because we're plugged in
-      hb.print_charge(GLED);
+      print_charge(GLED);
     }
   } else if (mode==AUTO_OFF_MODE) {
     if(millis()-auto_off_start_time > AUTO_OFF_WAIT) {
       hb.set_light(CURRENT_LEVEL, OFF_LEVEL, NOW);
     }
   }
 }
-
+

libraries/Readme.md

@@ -0,0 +1,14 @@
+Planned structure in moving to a framework:
+
+3 key directories:
+
+hb_modes - a collection of light modes (like light_spin, light_down, strobe_serial, selector_tap)<br>
+hb_utilities - things like print_number, click_counter, advanced
+accelerometer interfaces. In general, code that expands on the core
+library without any dependencies.<br>
+hexbright - core library, plus .h files for overridable
+options/behavior (low_battery, overheat, set_light_level)<br>
+
+hexbright functions by itself, but hb_utilities provide convenience functions and in some cases alter the behavior of the core library. 
+
+hb_modes simply provides an easy way to customize and share code.

libraries/hb_utilities/click_counter.cpp

@@ -0,0 +1,49 @@
+#include "click_counter.h"
+
+byte clickState;
+byte clickCount;
+word max_click_time;
+
+void config_click_count(word click_time) {
+  max_click_time = click_time;
+  clickState=0;
+}
+
+char click_count() {
+  switch(clickState) {
+  case CLICK_OFF:
+    if(hexbright::button_just_pressed()) {
+      // click just started
+      clickState = CLICK_ACTIVE;
+      clickCount=0;
+      //Serial.println("Clicking just started");
+    }
+    break;
+  case CLICK_ACTIVE:   
+    if(hexbright::button_just_released()) {
+      if(hexbright::button_pressed_time() > max_click_time) {
+	// button held to long
+	//Serial.println("Click held too long");
+	clickState = CLICK_OFF;
+      } else {
+	// click is counted
+	clickState = CLICK_WAIT;
+	clickCount++;
+	//Serial.println("Click counted");
+      }
+    }
+    break;
+  case CLICK_WAIT:
+    // button is released for long enough, we're done clicking
+    if(hexbright::button_released_time() > max_click_time) {
+      clickState = CLICK_OFF;
+      //Serial.print("Click finished: "); Serial.println((int)clickCount);
+      return clickCount;
+    } else if(hexbright::button_pressed()) {
+      // move back to active state
+      clickState = CLICK_ACTIVE;
+      //Serial.println("Click active");
+    }
+  }
+  return -127;
+} 

libraries/hb_utilities/click_counter.h

@@ -0,0 +1,20 @@
+#ifndef CLICK_COUNTER_H
+#define CLICK_COUNTER_H
+
+
+#include "hexbright.h"
+
+#define CLICK_OFF 0
+#define CLICK_ACTIVE 1
+#define CLICK_WAIT 2
+
+// Call in setup loop if you want to use the click counter
+// click_time is the maximum time a click can take before the counter resets
+extern void config_click_count(word click_time);
+
+// The number of clicks <= click_time.  Will not return a count until click_time ms after the button release.
+// Will return -127 unless returning a valid count.
+extern char click_count();
+
+
+#endif //CLICK_COUNTER_H

libraries/hb_utilities/input_digit.cpp

@@ -0,0 +1,21 @@
+#include "input_digit.h"
+
+static unsigned int read_value = 0;
+
+unsigned int get_input_digit() {
+  return read_value;
+}
+
+void input_digit(unsigned int min_digit, unsigned int max_digit) {
+  unsigned int tmp2 = 999 - atan2(hexbright::vector(0)[0], hexbright::vector(0)[2])*159 - 500; // scale from 0-999, counterclockwise = higher
+  tmp2 = (tmp2*(max_digit-min_digit))/1000+min_digit;
+  if(tmp2 == read_value) {
+    if(!printing_number()) {
+      print_number(tmp2);
+    }
+  } else {
+    reset_print_number();
+    hexbright::set_led(GLED,100);
+  }
+  read_value = tmp2; 
+}

libraries/hb_utilities/input_digit.h

@@ -0,0 +1,19 @@
+#ifndef INPUT_DIGIT_H
+#define INPUT_DIGIT_H
+
+#include "hexbright.h"
+#include "print_number.h"
+
+// reads a value between min_digit to max_digit-1, see hb-examples/numeric_input
+//  Twist the light to change the value.  When the current value changes, 
+//   the green LED will flash, and the number that is currently being printed 
+//   will be reset.  Suppose you are at 2 and you want to go to 5.  Rotate 
+//   clockwise 3 green flashes, and you'll be there.
+//  The current value is printed through the rear leds.
+// Get the result with get_input_digit.
+extern void input_digit(unsigned int min_digit, unsigned int max_digit);
+
+// grab the value that is currently selected (based on twist orientation)
+extern unsigned int get_input_digit();
+
+#endif // INPUT_DIGIT_H