Adding support for the shake sensor

src/adafruit_circuitplayground/express.py

@@ -9,6 +9,8 @@
 from . import utils
 from collections import namedtuple
 
+Acceleration = namedtuple('acceleration', ['x', 'y', 'z'])
+
 
 class Express:
     def __init__(self):
@@ -35,16 +37,15 @@ def __init__(self):
             'light': 0,
             'motion_x': 0,
             'motion_y': 0,
-            'motion_z': 0
+            'motion_z': 0,
+            'shake': False,
         }
 
         self.pixels = Pixel(self.__state)
         self.__abs_path_to_code_file = ''
 
     @property
     def acceleration(self):
-        Acceleration = namedtuple('acceleration', ['x', 'y', 'z'])
-
         return Acceleration(self.__state['motion_x'], self.__state['motion_y'], self.__state['motion_z'])
 
     @property
@@ -79,6 +80,9 @@ def light(self):
     def __show(self):
         utils.show(self.__state)
 
+    def shake(self, shake_threshold=30):
+        return self.__state['shake']
+
     def play_file(self, file_name):
         file_name = utils.remove_leading_slashes(file_name)
         abs_path_parent_dir = os.path.abspath(

src/adafruit_circuitplayground/test/test_express.py

@@ -3,6 +3,7 @@
 from ..express import Express
 from ..pixel import Pixel
 
+
 class TestExpress(object):
 
     def setup_method(self):
@@ -17,23 +18,23 @@ def setup_method(self):
         }
         self.pixels = Pixel(self.__state)
         self.__speaker_enabled = False
-    
+
     def test_button_a(self):
         self.cpx._Express__state['button_a'] = True
         assert True == self.cpx.button_a
-    
+
     def test_button_b(self):
         self.cpx._Express__state['button_b'] = True
         assert True == self.cpx.button_b
 
     def test_red_led(self):
         self.cpx._Express__state['red_led'] = True
         assert True == self.cpx.red_led
-    
+
     def test_red_led_int(self):
         self.cpx.red_led = 3
         assert True == self.cpx.red_led
-    
+
     def test_red_led_string(self):
         self.cpx.red_led = 'foo'
         assert True == self.cpx.red_led
@@ -53,11 +54,15 @@ def test_set_item_list(self):
     def test_set_item_hex(self):
         self.cpx.pixels[0] = 0xFFFFFF
         assert (255, 255, 255) == self.cpx._Express__state['pixels'][0]
-    
+
     def test_set_item_invalid(self):
         with pytest.raises(ValueError):
             self.cpx.pixels[0] = "hello"
-
+
+    def test_shake(self):
+        self.cpx._Express__state['shake'] = True
+        assert True == self.cpx.shake()
+
     def test_play_file_mp4(self):
         with pytest.raises(TypeError):
             self.cpx.play_file('sample.mp4')
@@ -69,20 +74,22 @@ def test_fill(self):
 
     def test_extract_pixel_value_list(self):
         assert (0, 255, 0) == self.cpx.pixels._Pixel__extract_pixel_value((0, 255, 0))
-        
+
     def test_extract_pixel_value_list1(self):
-        assert (123, 123, 123) == self.cpx.pixels._Pixel__extract_pixel_value([123, 123, 123])
+        assert (123, 123, 123) == self.cpx.pixels._Pixel__extract_pixel_value(
+            [123, 123, 123])
 
     def test_extract_pixel_value_int(self):
         assert (0, 0, 255) == self.cpx.pixels._Pixel__extract_pixel_value(255)
 
     def test_extract_pixel_value_tuple(self):
-        assert (0, 255, 0) == self.cpx.pixels._Pixel__extract_pixel_value((0, 255, 0))
+        assert (0, 255, 0) == self.cpx.pixels._Pixel__extract_pixel_value(
+            (0, 255, 0))
 
     def test_extract_pixel_value_invalid_length(self):
         with pytest.raises(ValueError):
-            self.cpx.pixels._Pixel__extract_pixel_value((1,2,3,4))
-    
+            self.cpx.pixels._Pixel__extract_pixel_value((1, 2, 3, 4))
+
     def test_extract_pixel_value_invalid_tuple_value(self):
         with pytest.raises(ValueError):
             self.cpx.pixels._Pixel__extract_pixel_value((0, 222, "hello"))

src/process_user_code.py

@@ -16,6 +16,7 @@
     'switch',
     'temperature',
     'light',
+    'shake',
     'motion_x',
     'motion_y',
     'motion_z'

src/view/components/toolbar/InputSlider.tsx

@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 import * as React from "react";
-import { ISliderProps } from "./Toolbar_utils";
+import { ISliderProps } from "./ToolbarUtils";
 import "../../styles/InputSlider.css";
 
 interface vscode {

src/view/components/toolbar/LightSensorBar.tsx

@@ -4,7 +4,7 @@
 import * as React from "react";
 import InputSlider from "./InputSlider";
 import "./LightSensorBar.css";
-import { ISensorProps, ISliderProps, X_SLIDER_INDEX } from "./Toolbar_utils";
+import { ISensorProps, ISliderProps, X_SLIDER_INDEX } from "./ToolbarUtils";
 
 const LIGHT_SLIDER_PROPS: ISliderProps = {
   maxValue: 255,

src/view/components/toolbar/MotionSensorBar.tsx

@@ -3,14 +3,28 @@
 
 import * as React from "react";
 import InputSlider from "./InputSlider";
+import SensorButton from "./SensorButton";
+
 import {
   ISensorProps,
   ISliderProps,
   X_SLIDER_INDEX,
   Z_SLIDER_INDEX,
   Y_SLIDER_INDEX
-} from "./Toolbar_utils";
+} from "./ToolbarUtils";
+
 import "../../styles/MotionSensorBar.css";
+import { CONSTANTS } from "../../constants";
+
+interface vscode {
+  postMessage(message: any): void;
+}
+
+declare const vscode: vscode;
+
+const sendMessage = (state: any) => {
+  vscode.postMessage({ command: "sensor-changed", text: state });
+};
 
 const MOTION_SLIDER_PROPS_X: ISliderProps = {
   maxValue: 125,
@@ -55,6 +69,15 @@ class MotionSensorBar extends React.Component {
         <div className="header">
           <div className="title">{MOTION_SENSOR_PROPERTIES.LABEL}</div>
         </div>
+        <SensorButton
+          label="Shake"
+          type="shake"
+          onMouseUp={this.onMouseUp}
+          onMouseDown={this.onMouseDown}
+          onKeyUp={this.onKeyUp}
+          onKeyDown={this.onKeyDown}
+        />
+        <br />
         <InputSlider
           minValue={
             MOTION_SENSOR_PROPERTIES.sliderProps[X_SLIDER_INDEX].minValue
@@ -102,9 +125,34 @@ class MotionSensorBar extends React.Component {
             MOTION_SENSOR_PROPERTIES.sliderProps[Z_SLIDER_INDEX].maxLabel
           }
         />
+        <br />
       </div>
     );
   }
+
+  private onMouseDown = () => this.handleOnclick(true, "shake");
+
+  private onKeyUp = (event: React.KeyboardEvent<HTMLButtonElement>) =>
+    this.onKeyEvent(event, false);
+
+  private onKeyDown = (event: React.KeyboardEvent<HTMLButtonElement>) =>
+    this.onKeyEvent(event, true);
+
+  private onMouseUp = () => this.handleOnclick(false, "shake");
+
+  private handleOnclick = (active: boolean, type: string) => {
+    const messageState = { [type]: active };
+    sendMessage(messageState);
+  };
+
+  private onKeyEvent(
+    event: React.KeyboardEvent<HTMLButtonElement>,
+    active: boolean
+  ) {
+    if ([event.keyCode, event.key].includes(CONSTANTS.KEYBOARD_KEYS.ENTER)) {
+      this.handleOnclick(active, "shake");
+    }
+  }
 }
 
 export default MotionSensorBar;

src/view/components/toolbar/SensorButton.tsx

@@ -0,0 +1,20 @@
+import * as React from "react";
+import { ISensorButtonProps } from "./ToolbarUtils";
+import "../../styles/SensorButton.css";
+
+const SensorButton: React.FC<ISensorButtonProps> = props => {
+  return (
+    <button
+      onMouseUp={props.onMouseUp}
+      onMouseDown={props.onMouseDown}
+      onKeyUp={props.onKeyUp}
+      onKeyDown={props.onKeyDown}
+      aria-label={`${props.type} sensor button`}
+      className="sensor-button"
+    >
+      {props.label}
+    </button>
+  );
+};
+
+export default SensorButton;

src/view/components/toolbar/TemperatureSensorBar.tsx

@@ -3,7 +3,7 @@
 
 import * as React from "react";
 import InputSlider from "./InputSlider";
-import { ISensorProps, ISliderProps, X_SLIDER_INDEX } from "./Toolbar_utils";
+import { ISensorProps, ISliderProps, X_SLIDER_INDEX } from "./ToolbarUtils";
 import "../../styles/TemperatureSensorBar.css";
 
 const TEMPERATURE_SLIDER_PROPS: ISliderProps = {

src/view/components/toolbar/Toolbar_utils.tsx → src/view/components/toolbar/ToolbarUtils.tsx

@@ -8,6 +8,15 @@ export interface ISliderProps {
   type: string;
 }
 
+export interface ISensorButtonProps {
+  label: string;
+  type: string;
+  onMouseUp: () => void;
+  onMouseDown: () => void;
+  onKeyUp: (event: React.KeyboardEvent<HTMLButtonElement>) => void;
+  onKeyDown: (event: React.KeyboardEvent<HTMLButtonElement>) => void;
+}
+
 export interface ISensorProps {
   LABEL: string;
   sliderProps: ISliderProps[];

src/view/styles/SensorButton.css

@@ -0,0 +1,24 @@
+.sensor-button {
+  color: var(--vscode-badge-foreground);
+  text-align: center;
+  background-color: var(--vscode-button-background);
+  width: 343px;
+  height: 32px;
+  border: none;
+  font-weight: bolder;
+  float: left;
+  padding-left: 20px;
+  margin-bottom: 20px;
+  margin-top: 20px;
+}
+
+.sensor-button:focus,
+.sensor-button:active {
+  outline-width: thick;
+  outline-offset: 4px;
+  outline: 2px solid var(--vscode-focusBorder);
+  background-color: var(--vscode-button-hoverBackground);
+}
+.sensor-button:hover {
+  background-color: var(--vscode-button-hoverBackground);
+}