Merge pull request #3 from sixteenmillimeter/dev

Update master with hardware work from dev branch

hardware/intval3.scad

@@ -9,15 +9,15 @@ include <./plunger.scad>
 
 module stl_plate () {
     //translate([0, 0, -0.5]) cube([150, 150, 1], center = true);
-    translate([-38, 41, 7.5]) rotate([0, 180, 0]) intval_laser_standoffs_plate();
+    translate([-60, 10, 7.5]) rotate([0, 180, 0]) intval_laser_standoffs_plate();
-    translate([-27, 40, -9.5]) rotate([0, 0, 13]) translate([-40 + 2, -1, 14]) rotate([0, 0, -13]) l289N_mount();
+    translate([-27, 50, -9.5]) rotate([0, 0, 13]) translate([-40 + 2, -1, 14]) rotate([0, 0, -13]) l289N_mount();
     
     translate([23, 1, -5.75]) rotate([0, 0, 90]) motor_mount_bottom();
     translate([48, -13, 9]) rotate([0, 180, 0]) key_cap();
     translate([-5, -11, 3]) rotate([0, 0, 190]) geared_motor_mount_120();
-    translate([65, 44, 22.5]) rotate([0, 180, 0]) motor_key();
+    translate([65, 44, 26.5]) rotate([0, 180, 0]) motor_key_120();
-    translate([0, -42, 15]) plunger_plate();
+    translate([15, -42, 15]) plunger_plate();
-    translate([-52, -20, 66]) rotate([0, 180, 0]) motor_cap(false);
+    translate([-52, -20, 85.5]) rotate([0, 180, -90]) motor_cap_120(false);
 };
 
 module dxf_plate () {
@@ -44,15 +44,17 @@ module exploded_view () {
 //intval_laser_panel_cover(true, ALL_RED=true);
 //rotate([0, 0, 13]) intval_panel_laser();
 //rotate([0, 0, 13]) intval_laser_panel_cover();
-key_cap();
+//key_cap();
 //geared_motor_mount_120();
 //motor_key();
 //motor_key_120();
 //plunger_plate();
+//plunger();
+//rotate([0, 180, 0]) plunger_top();
 //motor_cap(false);
-//motor_cap_120(false);
+//rotate([0, 180, 0]) motor_cap_120(false);
 //translate([0, 0, 39 / 2 + 5.75]) bolt_guide();
 
 //exploded_view();
-//stl_plate();
+stl_plate();
 //dxf_plate();

hardware/mount.scad

@@ -63,6 +63,22 @@ module motor_key_120 (half = false, DECOYS = false, sides = 1, ALT = false) {
     }
 }
 
+
+module motor_key_120_reinforced () {
+    motor_key_120();
+
+}
+
+module motor_key_120_master_mold () {
+    $fn = 200;
+    translate([54, -12, 26.4]) rotate([0, 180, 0]) motor_key_120();
+    difference() {
+        translate([0, 0, 16]) cylinder(r1= 30, r2 = 30, h = 42,  center = true);
+        translate([0, 0, 21]) cylinder(r1= 26, r2 = 26, h = 42,  center = true);
+    //translate([50, 0, 0]) cube([100, 100, 100], center = true);
+        }
+}
+
 module motor_set_screw_120 () {
     cube([10.19, 2.95, 2.95], center = true);
     translate([(10.19 / 2) - (2.56 / 2), 0, 0]) cube([2.56, 5.8, 5.8], center = true);    

lib/intval_rpio/index.js

@@ -0,0 +1,37 @@
+'use strict'
+
+//Optimized rpio-writebuf re-write of the intval module
+//https://gist.github.com/jperkin/e1f0ce996c83ccf2bca9
+
+const db = require('../db')
+const log = require('../log')('intval3')
+const storage = require('node-persist')
+const fs = require('fs')
+const Rpio = require('rpio')
+
+const intval = {}
+
+
+intval.init = function () {}
+intval._restoreState = function () {}
+intval._setState = function () {}
+intval._storeState = function () {}
+intval._declarePins = function () {}
+intval._undeclarePins = function () {}
+intval._startFwd = function () {}
+intval._startBwd = function () {}
+intval._pause = function () {}
+intval._stop = function () {}
+intval._watchMicro = function () {}
+intval._watchRelease = function () {}
+intval._releaseStateColsed = function () {}
+
+intval.reset = function () {}
+intval.setDir = function () {}
+intval.setExposure = function () {}
+intval.setDelay = function () {}
+intval.setCounter = function () {} 
+intval.frame = function () {}
+intval.status = function () {}
+
+module.exports = intval

package.json

@@ -24,21 +24,21 @@
   },
   "homepage": "https://github.com/sixteenmillimeter/intval3#readme",
   "dependencies": {
-    "bleno": "^0.4.2",
+    "bleno": "^0.5.0",
     "cron": "^1.2.1",
     "gpio": "^0.2.7",
     "node-ipc": "^9.1.0",
     "node-persist": "^2.1.0",
     "onoff": "^1.1.5",
-    "restify": "^5.2.0",
+    "restify": "^7.2.1",
     "rpio": "^0.9.20",
-    "sqlite3": "^3.1.13",
+    "sqlite3": "^4.0.2",
     "squel": "^5.12.0",
     "uuid": "^3.1.0",
     "winston": "^2.3.1"
   },
   "devDependencies": {
-    "jsdoc-to-markdown": "^3.0.0",
+    "jsdoc-to-markdown": "^4.0.1",
-    "qunit": "^2.5.0"
+    "qunit": "^2.6.2"
   }
 }