Merge pull request #69 from PunchThrough/develop

Release Candidate: 2.0.1

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "hardware/bean/avr/cores/bean/applicationMessageHeaders"]
 	path = hardware/bean/avr/cores/bean/applicationMessageHeaders
 	url = https://bitbucket.org/punchthroughdesign/bean-application-message-definitions.git
-[submodule "hardware/bean/avr/libraries/PinChangeInt"]
-	path = hardware/bean/avr/libraries/PinChangeInt
-	url = https://github.com/PunchThrough/PinChangeInt.git

CHANGELOG.md

@@ -0,0 +1,33 @@
+# 2.0.1
+
+### Features
+
+* New macro `#IS_BEAN` - `0` for Bean+ and `1` for Bean
+
+### Fixes
+
+* Fixed typo `ObserverAdvertisementInfo`
+* Fixed PlatformIO tests on Circle
+
+### Other
+
+* Removed PinChangeInt submodule, added as direct dependency
+* New PlatformIO test that includes builtin libraries
+
+---
+
+# 2.0.0
+
+### Documentation
+
+* Vastly improve Doxygen code coverage. Used for doc generation at punchthrough.com/bean/reference.
+
+### Other
+
+* Build scripts and examples
+
+---
+
+# < 2.0.0
+
+See git history.

circle.yml

@@ -18,18 +18,19 @@ dependencies:
   cache_directories:
     - ~/.platformio
   override:
+    - pip install --upgrade pip setuptools virtualenv
     - pip install cpplint
     # Used for deployment
     - sudo apt-get update
     - sudo apt-get install doxygen
     - npm install
     # Don't install PlatformIO if it's already been set up; it takes forever
-    #- if [ ! -f "~/.platformio/appstate.json" ]; then scripts/setup_platformio.sh; fi
+    - if [ ! -f "~/.platformio/appstate.json" ]; then scripts/setup_platformio.sh; fi
 
 test:
   override:
     - scripts/lint_all.py --lint
-    #- scripts/compile_all.py
+    - scripts/compile_all.py
   post:
     - make docs
     - cp -R docs $CIRCLE_ARTIFACTS

examples/observer/observer.ino

@@ -18,7 +18,7 @@ uint8_t expectedPacket[] = {
 void loop() {
   uint32_t start = millis();
 
-  ObseverAdvertisementInfo info;
+  ObserverAdvertisementInfo info;
   int res = Bean.getObserverMessage(&info, 2000);
   if (res == 1) {
     Serial.print(info.eventType);

hardware/bean/avr/cores/bean/Bean.cpp

@@ -561,7 +561,7 @@ void BeanClass::setCustomAdvertisement(uint8_t *buf, int len) {
   Serial.setCustomAdvertisement(buf, len);
 }
 
-int BeanClass::getObserverMessage(ObseverAdvertisementInfo *message,
+int BeanClass::getObserverMessage(ObserverAdvertisementInfo *message,
                                   unsigned long timeout) {
   return Serial.getObserverMessage(message, timeout);
 }

hardware/bean/avr/cores/bean/Bean.h

@@ -94,7 +94,7 @@ typedef ADV_SWITCH_ENABLED_T BluetoothServices;
 /**
  *  Data returned by the observer role.
  */
-typedef OBSERVER_INFO_MESSAGE_T ObseverAdvertisementInfo;
+typedef OBSERVER_INFO_MESSAGE_T ObserverAdvertisementInfo;
 
 class BeanClass {
  public:
@@ -332,7 +332,7 @@ class BeanClass {
    *
    *  @include observer/observer.ino
    */
-  int getObserverMessage(ObseverAdvertisementInfo *message, unsigned long timeout);
+  int getObserverMessage(ObserverAdvertisementInfo *message, unsigned long timeout);
   ///@}