add harmonics, proprioceptives, do logplot, wow

data.csv

@@ -6,8 +6,8 @@ Steppers,NEMA17-38,0.37,0.37,0.285,26,1500,1500,16.95
 Steppers,NEMA17-48,0.32,0.32,0.350,25,1200,1500,19.95
 Steppers,NEMA23-56,0.9,0.9,0.700,69.11,1200,2010,39.95
 Steppers,NEMA23-76,1.9,1.9,1.000,84,1350,2040,49.95
-DC Gearmotors,PololuMicro-HPCB-12V-1:100,0.21,0.21,0.0095,9.6,150,320,18.95
-DC Gearmotors,PololuMicro-HPCB-12V-1:10,0.025,0.025,0.0095,9.6,1500,3000,18.95
+DC GM,PololuMicro-HPCB-12V-1:100,0.21,0.21,0.0095,9.6,150,320,18.95
+DC GM,PololuMicro-HPCB-12V-1:10,0.025,0.025,0.0095,9.6,1500,3000,18.95
 Servos,Teknic-2321D,1.0,0.2,0.9,85,4000,4000,565
 Servos,Teknic-2321P,1.74,0.35,0.9,145,4000,4000,565
 Servos,Teknic-2321S,3.74,0.7,0.9,200,2890,3170,565
@@ -16,18 +16,34 @@ Servos,Teknic-3432P,4.92,1.47,2.8,346,2330,2380,655
 Servos,Teknic-3432S,9.86,2.77,2.8,273,970,1130,655
 Servos,Teknic-3441S,13.02,3.38,3.6,249,730,840,695
 BLDCs,NAME,Tmax,Tconst,Weight,Power,RPM,RPM,Cost
-BLDCs,2830 1200,0.22,0.22,0.069,400,13000,13000,18
-BLDCs,2836 2300,0.19,0.19,0.079,630,26000,26000,24
-BLDCs,3542 1000,0.45,0.45,0.13,800,13000,13000,25
-BLDCs,4258 500,1.15,1.15,0.3,1200,8000,8000,44
-BLDCs,5060 380,2.26,2.26,0.44,2400,8100,8100,52
-BLDCs,3510 360,0.68,0.68,0.1,568,6300,6300,35
-BLDCs,4010 475,0.53,0.53,0.127,581,8400,8400,27
-BLDCs,4108 370,0.41,0.41,0.108,355,6500,6500,37
-BLDCs,4108 475,0.44,0.44,0.108,490,8400,8400,37
-BLDCs,4108 700,0.41,0.41,0.108,560,10300,10300,37
-BLDCs,4114 340,0.85,0.85,0.148,560,5000,5000,40
-BLDCs,5206 320,0.52,0.52,0.162,384,5600,5600,38
-BLDCs,9225 90,3.82,3.82,0.4,1200,2400,2400,165
-BLDCs,9225 160,2.86,2.86,0.329,1200,3200,3200,103
-BLDCs,9235 100,5.44,5.44,0.678,2800,3900,3900,165
\ No newline at end of file
+BLDCs,2830 1200,0.22,0.08,0.069,400,13000,13000,18
+BLDCs,2836 2300,0.19,0.12,0.079,630,26000,26000,24
+BLDCs,3542 1000,0.45,0.2,0.13,800,13000,13000,25
+BLDCs,4258 500,1.15,0.6,0.3,1200,8000,8000,44
+BLDCs,5060 380,2.26,0.9,0.44,2400,8100,8100,52
+BLDCs,3510 360,0.68,0.4,0.1,568,6300,6300,35
+BLDCs,4010 475,0.53,0.3,0.127,581,8400,8400,27
+BLDCs,4108 370,0.41,0.2,0.108,355,6500,6500,37
+BLDCs,4108 475,0.44,0.2,0.108,490,8400,8400,37
+BLDCs,4108 700,0.41,0.2,0.108,560,10300,10300,37
+BLDCs,4114 340,0.85,0.6,0.148,560,5000,5000,40
+BLDCs,5206 320,0.52,0.3,0.162,384,5600,5600,38
+BLDCs,9225 90,3.82,1.5,0.4,1200,2400,2400,165
+BLDCs,9225 160,2.86,1.1,0.329,1200,3200,3200,103
+BLDCs,9235 100,5.44,2.8,0.678,2800,3900,3900,165
+BLDCS,U10,6.55,1.45,0.4,600,4000,4000,345
+BLDC GM,U10-1,28,10.15,0.665,600,570,570,650
+BLDC GM,U10-2,196,71.1,0.93,600,80,80,780
+BLDC GM,BK-MA,7.4,7.4,0.35,500,120,120,900
+BLDC GM,BK-MA-2,44.4,44.4,0.6,500,20,20,1200
+SEA,Maxon EC-Max 116,2.5,1.3,0.315,20,90,90,800
+BLDC HD,RSF-17A-100,54,20,2.1,62,30,30,1800
+BLDC HD,RSF-17A-50,34,9.8,2.1,62,60,60,1800
+BLDC HD,RSF-20A-100,82,35,2.9,111,30,30,1900
+BLDC HD,RSF-20A-50,56,19,2.9,111,60,60,1900
+BLDC HD,RSF-25A-100,157,59,4.7,190,30,30,2200
+BLDC HD,RSF-25A-50,98,29,4.7,190,60,60,2200
+BLDC HD,RSF-32A-100,330,98,8.7,310,30,30,2700
+BLDC HD,RSF-32A-50,220,49,8.7,310,60,60,2700
+BLDC HD,RKF-20A-100,82,35,2.9,111,30,30,1900
+BLDC HD,RKF-32A-100,330,98,8.7,310,30,30,3000
\ No newline at end of file

plotter.js

@@ -36,8 +36,8 @@ Plotly.d3.csv('data.csv', function(err, rows){
     }
 
     // Default data
-    chosenSets = ['Steppers', 'Servos', 'BLDCs'];
-    setChart(listofValues[5], listofValues[9]);
+    chosenSets = ['Steppers', 'Servos', 'BLDCs', 'BLDC GM', 'BLDC HD'];
+    setChart(listofValues[8], listofValues[9]);
 
     function setChart(chosenXStat, chosenYStat) {
 
@@ -75,7 +75,17 @@ Plotly.d3.csv('data.csv', function(err, rows){
         var layout = {
             title:'modplot',
             height: 1000,
-            width: 1000
+            width: 1000,
+            xaxis: {
+              type:'log',
+              autorange: true,
+              title:'x'
+            },
+            yaxis: {
+              type:'log',
+              autorange: true,
+              title:'y'
+            }
         };
 
         Plotly.newPlot('plotdiv', traces, layout);
@@ -109,7 +119,7 @@ Plotly.d3.csv('data.csv', function(err, rows){
     assignOptions(listofValues, xSelector);
     assignOptions(listofValues, ySelector);
     makeCheckboxes(listofSets, setSelector);
-    xSelector.value = listofValues[5];
+    xSelector.value = listofValues[8];
     ySelector.value = listofValues[9];
 
     // update after dropdown