Maintenance: cleanup require calls

rwaldron · Nov 17, 2015 · a858588 · a858588
1 parent de09603
commit a858588
Show file tree

Hide file tree

Showing 41 changed files with 104 additions and 104 deletions.
diff --git a/lib/accelerometer.js b/lib/accelerometer.js
@@ -1,7 +1,7 @@
-var Board = require("../lib/board.js"),
+var Board = require("./board"),
   events = require("events"),
   util = require("util"),
-  __ = require("../lib/fn.js"),
+  __ = require("./fn"),
   sum = __.sum,
   fma = __.fma,
   constrain = __.constrain,
@@ -61,7 +61,7 @@ var Controllers = {
   MPU6050: {
     initialize: {
       value: function(opts, dataHandler) {
-        var IMU = require("../lib/imu");
+        var IMU = require("./imu");
         var driver = IMU.Drivers.get(this.board, "MPU6050", opts);
         var state = priv.get(this);
 

diff --git a/lib/altimeter.js b/lib/altimeter.js
@@ -1,4 +1,4 @@
-var Board = require("../lib/board.js"),
+var Board = require("./board"),
   Emitter = require("events").EventEmitter,
   util = require("util");
 
@@ -17,7 +17,7 @@ var Controllers = {
     },
     initialize: {
       value: function(opts, dataHandler) {
-        var Multi = require("../lib/imu");
+        var Multi = require("./imu");
         var driver = Multi.Drivers.get(this.board, "MPL3115A2", opts);
         driver.on("data", function(data) {
           dataHandler(data.altitude);

diff --git a/lib/animation.js b/lib/animation.js
@@ -7,7 +7,7 @@
 var ease = require("ease-component"),
   Emitter = require("events").EventEmitter,
   util = require("util"),
-  __ = require("../lib/fn.js"),
+  __ = require("./fn"),
   temporal;
 
 Animation.DEFAULTS = {

diff --git a/lib/barometer.js b/lib/barometer.js
@@ -1,4 +1,4 @@
-var Board = require("../lib/board.js");
+var Board = require("./board");
 var Emitter = require("events").EventEmitter;
 var util = require("util");
 
@@ -7,7 +7,7 @@ var Controllers = {
   MPL115A2: {
     initialize: {
       value: function(opts, dataHandler) {
-        var Multi = require("../lib/imu");
+        var Multi = require("./imu");
         var driver = Multi.Drivers.get(this.board, "MPL115A2", opts);
         driver.on("data", function(data) {
           dataHandler.call(this, data.pressure);
@@ -26,7 +26,7 @@ var Controllers = {
   MPL3115A2: {
     initialize: {
       value: function(opts, dataHandler) {
-        var Multi = require("../lib/imu");
+        var Multi = require("./imu");
         var driver = Multi.Drivers.get(this.board, "MPL3115A2", opts);
         driver.on("data", function(data) {
           dataHandler.call(this, data.pressure);
@@ -46,7 +46,7 @@ var Controllers = {
   BMP180: {
     initialize: {
       value: function(opts, dataHandler) {
-        var Multi = require("../lib/imu");
+        var Multi = require("./imu");
         var driver = Multi.Drivers.get(this.board, "BMP180", opts);
         driver.on("data", function(data) {
           dataHandler.call(this, data.pressure);

diff --git a/lib/board.js b/lib/board.js
@@ -9,11 +9,11 @@ var util = require("util");
 // var os = require("os");
 var chalk = require("chalk");
 var _ = require("lodash");
-var Collection = require("../lib/mixins/collection");
-var __ = require("../lib/fn.js");
-var Repl = require("../lib/repl.js");
-var Options = require("../lib/board.options.js");
-var Pins = require("../lib/board.pins.js");
+var Collection = require("./mixins/collection");
+var __ = require("./fn");
+var Repl = require("./repl.js");
+var Options = require("./board.options.js");
+var Pins = require("./board.pins.js");
 var Expander;
 //var temporal = require("temporal");
 //var IO;
@@ -823,7 +823,7 @@ Board.Component = function(opts, componentOpts) {
   }
 
   if (!Expander) {
-    Expander = require("../lib/expander");
+    Expander = require("./expander");
   }
 
   if (opts.controller && Expander.hasController(opts.controller)) {

diff --git a/lib/board.pins.js b/lib/board.pins.js
@@ -1,4 +1,4 @@
-var Options = require("./board.options.js");
+var Options = require("./board.options");
 
 var MODES = {
   INPUT: 0x00,

diff --git a/lib/button.js b/lib/button.js
@@ -1,7 +1,7 @@
-var Board = require("../lib/board");
-var EVS = require("../lib/evshield");
+var Board = require("./board");
+var EVS = require("./evshield");
 var Pins = Board.Pins;
-var __ = require("../lib/fn");
+var __ = require("./fn");
 var events = require("events");
 var util = require("util");
 

diff --git a/lib/color.js b/lib/color.js
@@ -1,8 +1,8 @@
-var Board = require("../lib/board");
-var EVS = require("../lib/evshield");
+var Board = require("./board");
+var EVS = require("./evshield");
 var Emitter = require("events").EventEmitter;
 var util = require("util");
-var __ = require("../lib/fn");
+var __ = require("./fn");
 var priv = new Map();
 
 

diff --git a/lib/compass.js b/lib/compass.js
@@ -1,7 +1,7 @@
-var Board = require("../lib/board.js"),
+var Board = require("./board"),
   Emitter = require("events").EventEmitter,
   util = require("util"),
-  __ = require("../lib/fn.js"),
+  __ = require("./fn"),
   int16 = __.int16;
 
 

diff --git a/lib/distance.js b/lib/distance.js
@@ -1,4 +1,4 @@
-var Sensor = require("../lib/sensor.js"),
+var Sensor = require("./sensor"),
   util = require("util");
 
 

diff --git a/lib/esc.js b/lib/esc.js
@@ -1,10 +1,10 @@
 var IS_TEST_MODE = !!process.env.IS_TEST_MODE;
-var Board = require("../lib/board");
-var Expander = require("../lib/expander");
+var Board = require("./board");
+var Expander = require("./expander");
 var Pins = Board.Pins;
 var Emitter = require("events").EventEmitter;
 var util = require("util");
-var Collection = require("../lib/mixins/collection");
+var Collection = require("./mixins/collection");
 var __ = require("./fn");
 
 var priv = new Map();

diff --git a/lib/expander.js b/lib/expander.js
@@ -1,9 +1,9 @@
 var IS_TEST_MODE = !!process.env.IS_TEST_MODE;
-var Board = require("../lib/board");
+var Board = require("./board");
 var Emitter = require("events").EventEmitter;
 var util = require("util");
-var nanosleep = require("../lib/sleep").nano;
-var __ = require("../lib/fn");
+var nanosleep = require("./sleep").nano;
+var __ = require("./fn");
 var priv = new Map();
 var active = new Map();
 

diff --git a/lib/gripper.js b/lib/gripper.js
@@ -1,5 +1,5 @@
-var Servo = require("../lib/servo.js"),
-  __ = require("../lib/fn.js");
+var Servo = require("./servo"),
+  __ = require("./fn");
 
 /**
  * Gripper

diff --git a/lib/gyro.js b/lib/gyro.js
@@ -1,7 +1,7 @@
-var Board = require("../lib/board.js"),
+var Board = require("./board"),
   events = require("events"),
   util = require("util"),
-  __ = require("../lib/fn.js"),
+  __ = require("./fn"),
   sum = __.sum;
 
 var priv = new Map();
@@ -61,7 +61,7 @@ var Controllers = {
   MPU6050: {
     initialize: {
       value: function(opts, dataHandler) {
-        var IMU = require("../lib/imu");
+        var IMU = require("./imu");
         var state = priv.get(this),
           driver = IMU.Drivers.get(this.board, "MPU-6050", opts);
 

diff --git a/lib/hygrometer.js b/lib/hygrometer.js
@@ -1,4 +1,4 @@
-var Board = require("../lib/board.js"),
+var Board = require("./board"),
   Emitter = require("events").EventEmitter,
   util = require("util");
 
@@ -8,7 +8,7 @@ var Controllers = {
   HTU21D: {
     initialize: {
       value: function(opts, dataHandler) {
-        var Multi = require("../lib/imu");
+        var Multi = require("./imu");
         var driver = Multi.Drivers.get(this.board, "HTU21D", opts);
         driver.on("data", function(data) {
           dataHandler(data.humidity);
@@ -27,7 +27,7 @@ var Controllers = {
   SI7020: {
     initialize: {
       value: function(opts, dataHandler) {
-        var Multi = require("../lib/imu");
+        var Multi = require("./imu");
         var driver = Multi.Drivers.get(this.board, "SI7020", opts);
         driver.on("data", function(data) {
           dataHandler(data.humidity);

diff --git a/lib/imu.js b/lib/imu.js
@@ -1,13 +1,13 @@
-var Board = require("../lib/board.js");
+var Board = require("./board");
 var Emitter = require("events").EventEmitter;
 var util = require("util");
-var __ = require("../lib/fn.js");
-var Accelerometer = require("../lib/accelerometer.js");
-var Altimeter = require("../lib/altimeter.js");
-var Barometer = require("../lib/barometer.js");
-var Hygrometer = require("../lib/hygrometer.js");
-var Thermometer = require("../lib/thermometer.js");
-var Gyro = require("../lib/gyro.js");
+var __ = require("./fn");
+var Accelerometer = require("./accelerometer.js");
+var Altimeter = require("./altimeter.js");
+var Barometer = require("./barometer.js");
+var Hygrometer = require("./hygrometer.js");
+var Thermometer = require("./thermometer.js");
+var Gyro = require("./gyro.js");
 var int16 = __.int16;
 var uint16 = __.uint16;
 var uint24 = __.uint24;

diff --git a/lib/ir.js b/lib/ir.js
@@ -1,4 +1,4 @@
-var Board = require("../lib/board.js"),
+var Board = require("./board"),
   events = require("events"),
   util = require("util");
 

diff --git a/lib/joystick.js b/lib/joystick.js
@@ -1,7 +1,7 @@
-var Board = require("../lib/board");
+var Board = require("./board");
 var Emitter = require("events").EventEmitter;
 var util = require("util");
-var __ = require("../lib/fn");
+var __ = require("./fn");
 var priv = new Map();
 var axes = ["x", "y"];
 

diff --git a/lib/keypad.js b/lib/keypad.js
@@ -1,7 +1,7 @@
 var Emitter = require("events").EventEmitter;
 var util = require("util");
-var Board = require("../lib/board.js");
-var __ = require("../lib/fn.js");
+var Board = require("./board");
+var __ = require("./fn");
 var int16 = __.int16;
 
 var priv = new Map();
@@ -44,7 +44,7 @@ function flatKeys(opts) {
 var Controllers = {
   MPR121QR2: {
     REGISTER: {
-      value: require("../lib/definitions/mpr121.js")
+      value: require("./definitions/mpr121.js")
     },
     initialize: {
       value: function(opts, dataHandler) {

diff --git a/lib/lcd.js b/lib/lcd.js
@@ -1,6 +1,6 @@
-var Board = require("../lib/board.js"),
-  Pin = require("../lib/pin.js"),
-  lcdCharacters = require("../lib/lcd-chars.js"),
+var Board = require("./board"),
+  Pin = require("./pin.js"),
+  lcdCharacters = require("./lcd-chars.js"),
   converter = require("color-convert")();
 
 var priv = new Map();

diff --git a/lib/led/led.js b/lib/led/led.js
@@ -1,7 +1,7 @@
 var IS_TEST_MODE = !!process.env.IS_TEST_MODE;
 var Board = require("../board.js");
-var Expander = require("../../lib/expander");
-var Animation = require("../animation.js");
+var Expander = require("../expander");
+var Animation = require("../animation");
 var Pins = Board.Pins;
 
 var priv = new Map();

diff --git a/lib/led/ledcontrol.js b/lib/led/ledcontrol.js
@@ -33,8 +33,8 @@
 
  */
 var IS_TEST_MODE = !!process.env.IS_TEST_MODE;
-var Board = require("../board.js");
-var ledCharacters = require("./led-chars.js");
+var Board = require("../board");
+var ledCharacters = require("./led-chars");
 
 // Led instance private data
 var priv = new Map(),

diff --git a/lib/light.js b/lib/light.js
@@ -1,5 +1,5 @@
-var Board = require("../lib/board");
-var EVS = require("../lib/evshield");
+var Board = require("./board");
+var EVS = require("./evshield");
 var within = require("./mixins/within");
 var __ = require("./fn");
 var Emitter = require("events").EventEmitter;

diff --git a/lib/motion.js b/lib/motion.js
@@ -1,4 +1,4 @@
-var Board = require("../lib/board.js"),
+var Board = require("./board"),
   events = require("events"),
   util = require("util"),
   priv = new Map();

diff --git a/lib/motor.js b/lib/motor.js
@@ -1,13 +1,13 @@
 var IS_TEST_MODE = !!process.env.IS_TEST_MODE;
-var Board = require("../lib/board");
-var Expander = require("../lib/expander.js");
-var EVS = require("../lib/evshield");
-var __ = require("../lib/fn");
+var Board = require("./board");
+var Expander = require("./expander.js");
+var EVS = require("./evshield");
+var __ = require("./fn");
 var events = require("events");
 var util = require("util");
-var Collection = require("../lib/mixins/collection");
-var Sensor = require("../lib/sensor");
-var ShiftRegister = require("../lib/shiftregister");
+var Collection = require("./mixins/collection");
+var Sensor = require("./sensor");
+var ShiftRegister = require("./shiftregister");
 
 var priv = new Map();
 var registers = new Map();

diff --git a/lib/nodebot.js b/lib/nodebot.js
@@ -1,5 +1,5 @@
-var Servo = require("../lib/servo.js"),
-  __ = require("../lib/fn.js"),
+var Servo = require("./servo.js"),
+  __ = require("./fn"),
   DIR_TRANSLATION,
   temporal;
 

diff --git a/lib/piezo.js b/lib/piezo.js
@@ -1,4 +1,4 @@
-var Board = require("../lib/board.js"),
+var Board = require("./board"),
   Timer = require("nanotimer");
 
 var priv = new Map();

diff --git a/lib/pin.js b/lib/pin.js
@@ -1,9 +1,9 @@
 var IS_TEST_MODE = !!process.env.IS_TEST_MODE;
-var Board = require("../lib/board.js");
+var Board = require("./board");
 var Descriptor = require("descriptor");
 var Emitter = require("events").EventEmitter;
 var util = require("util");
-var Collection = require("../lib/mixins/collection");
+var Collection = require("./mixins/collection");
 
 var priv = new Map();
 var modes = {

diff --git a/lib/ping.js b/lib/ping.js
@@ -1,4 +1,4 @@
-var Board = require("../lib/board.js"),
+var Board = require("./board"),
   Emitter = require("events").EventEmitter,
   util = require("util"),
   within = require("./mixins/within"),

diff --git a/lib/pir.js b/lib/pir.js
@@ -1,4 +1,4 @@
-var Board = require("../lib/board.js"),
+var Board = require("./board"),
   events = require("events"),
   util = require("util");
 

diff --git a/lib/proximity.js b/lib/proximity.js
@@ -1,5 +1,5 @@
-var Board = require("../lib/board");
-var EVS = require("../lib/evshield");
+var Board = require("./board");
+var EVS = require("./evshield");
 var within = require("./mixins/within");
 var __ = require("./fn");
 var Emitter = require("events").EventEmitter;