Skip to content
Browse files

merging

  • Loading branch information...
2 parents 2089dfc + ee7b323 commit c935d36876e3b53c646f713ee010cbd94993d013 @yonatantsav committed Dec 3, 2012
Showing with 1,511 additions and 47 deletions.
  1. BIN .DS_Store.orig
  2. +78 −0 AnalogInOutSerial/AnalogInOutSerial.pde
  3. BIN ArduinoSerialProcessing$py.class
  4. BIN Illumination.workflow/Contents/QuickLook/Thumbnail.png
  5. +1 −1 Illumination.workflow/Contents/document.wflow
  6. BIN MarkovGenerator$py.class
  7. +7 −0 README (Autosaved).txt
  8. +8 −1 README.md
  9. BIN captures/*RC*CaptureThm_00001
  10. BIN captures/*RC*CaptureThm_00002
  11. BIN captures/*RC*CaptureThm_00003
  12. BIN captures/*RC*CaptureThm_00004
  13. BIN captures/*RC*CaptureThm_00005
  14. BIN captures/*RC*CaptureThm_00006
  15. BIN captures/*RC*CaptureThm_00007
  16. BIN captures/*RC*CaptureThm_00008
  17. BIN captures/*RC*CaptureThm_00009
  18. BIN captures/*RC*CaptureThm_00010
  19. BIN captures/*RC*CaptureThm_00011
  20. BIN captures/*RC*CaptureThm_00012
  21. BIN captures/*RC*CaptureThm_00013
  22. BIN captures/*RC*CaptureThm_00014
  23. BIN captures/*RC*CaptureThm_00015
  24. BIN captures/*RC*CaptureThm_00016
  25. BIN captures/*RC*CaptureThm_00017
  26. BIN captures/*RC*CaptureThm_00018
  27. BIN captures/*RC*CaptureThm_00019
  28. BIN captures/*RC*CaptureThm_00020
  29. BIN captures/*RC*CaptureThm_00021
  30. BIN captures/*RC*CaptureThm_00022
  31. BIN captures/*RC*CaptureThm_00023
  32. BIN captures/*RC*CaptureThm_00024
  33. BIN captures/*RC*CaptureThm_00025
  34. BIN captures/*RC*CaptureThm_00026
  35. BIN captures/*RC*CaptureThm_00027
  36. BIN captures/*RC*CaptureThm_00028
  37. BIN captures/*RC*CaptureThm_00029
  38. BIN captures/*RC*CaptureThm_00030
  39. BIN captures/*RC*CaptureThm_00031
  40. BIN captures/*RC*CaptureThm_00032
  41. BIN captures/*RC*CaptureThm_00033
  42. BIN captures/*RC*CaptureThm_00034
  43. BIN captures/*RC*CaptureThm_00035
  44. BIN captures/*RC*CaptureThm_00036
  45. BIN captures/*RC*CaptureThm_00037
  46. BIN captures/*RC*CaptureThm_00038
  47. BIN captures/*RC*CaptureThm_00039
  48. BIN captures/*RC*CaptureThm_00040
  49. BIN captures/*RC*CaptureThm_00041
  50. BIN captures/*RC*CaptureThm_00042
  51. BIN captures/*RC*CaptureThm_00043
  52. BIN captures/*RC*CaptureThm_00044
  53. BIN captures/*RC*CaptureThm_00045
  54. BIN captures/*RC*CaptureThm_00046
  55. BIN captures/*RC*CaptureThm_00047
  56. BIN captures/*RC*CaptureThm_00048
  57. BIN captures/*RC*CaptureThm_00049
  58. BIN captures/*RC*CaptureThm_00050
  59. BIN captures/*RC*CaptureThm_00051
  60. BIN captures/*RC*CaptureThm_00052
  61. BIN captures/*RC*CaptureThm_00053
  62. BIN captures/*RC*CaptureThm_00054
  63. BIN captures/*RC*CaptureThm_00055
  64. BIN captures/*RC*CaptureThm_00056
  65. BIN captures/*RC*CaptureThm_00057
  66. BIN captures/*RC*CaptureThm_00058
  67. BIN captures/*RC*CaptureThm_00059
  68. BIN captures/*RC*CaptureThm_00060
  69. BIN captures/*RC*CaptureThm_00061
  70. BIN captures/*RC*CaptureThm_00062
  71. BIN captures/*RC*CaptureThm_00063
  72. BIN captures/*RC*CaptureThm_00064
  73. BIN captures/*RC*CaptureThm_00065
  74. BIN captures/*RC*CaptureThm_00066
  75. BIN captures/*RC*CaptureThm_00067
  76. BIN captures/*RC*CaptureThm_00068
  77. BIN captures/*RC*CaptureThm_00069
  78. BIN captures/*RC*CaptureThm_00070
  79. BIN captures/*RC*CaptureThm_00071
  80. BIN captures/*RC*CaptureThm_00072
  81. BIN captures/*RC*CaptureThm_00073
  82. BIN captures/*RC*CaptureThm_00074
  83. BIN captures/*RC*CaptureThm_00075
  84. BIN captures/*RC*CaptureThm_00076
  85. BIN captures/*RC*CaptureThm_00077
  86. BIN captures/*RC*CaptureThm_00078
  87. BIN captures/*RC*CaptureThm_00079
  88. BIN captures/*RC*CaptureThm_00080
  89. BIN captures/*RC*CaptureThm_00081
  90. BIN captures/*RC*CaptureThm_00082
  91. BIN captures/*RC*CaptureThm_00083
  92. BIN captures/*RC*CaptureThm_00084
  93. BIN captures/*RC*CaptureThm_00085
  94. BIN captures/*RC*CaptureThm_00086
  95. BIN captures/*RC*CaptureThm_00087
  96. BIN captures/*RC*CaptureThm_00088
  97. BIN captures/*RC*CaptureThm_00089
  98. BIN captures/*RC*CaptureThm_00090
  99. BIN captures/*RC*CaptureThm_00091
  100. BIN captures/*RC*CaptureThm_00092
  101. BIN captures/*RC*CaptureThm_00093
  102. BIN captures/*RC*CaptureThm_00094
  103. BIN captures/*RC*CaptureThm_00095
  104. BIN captures/*RC*CaptureThm_00096
  105. BIN captures/*RC*CaptureThm_00097
  106. BIN captures/*RC*CaptureThm_00098
  107. BIN captures/*RC*CaptureThm_00099
  108. BIN captures/*RC*CaptureThm_00100
  109. BIN captures/*RC*CaptureThm_00101
  110. BIN captures/*RC*CaptureThm_00102
  111. BIN captures/*RC*CaptureThm_00103
  112. BIN captures/*RC*CaptureThm_00104
  113. BIN captures/*RC*CaptureThm_00105
  114. BIN captures/*RC*CaptureThm_00106
  115. BIN captures/*RC*CaptureThm_00107
  116. BIN captures/*RC*CaptureThm_00108
  117. BIN captures/*RC*CaptureThm_00109
  118. BIN captures/*RC*CaptureThm_00110
  119. BIN captures/*RC*CaptureThm_00111
  120. BIN captures/*RC*CaptureThm_00112
  121. BIN captures/*RC*CaptureThm_00113
  122. BIN captures/*RC*CaptureThm_00114
  123. BIN captures/*RC*CaptureThm_00115
  124. BIN captures/*RC*CaptureThm_00116
  125. BIN captures/*RC*CaptureThm_00117
  126. BIN captures/*RC*CaptureThm_00118
  127. BIN captures/*RC*CaptureThm_00119
  128. BIN captures/*RC*CaptureThm_00120
  129. BIN captures/*RC*CaptureThm_00121
  130. BIN captures/*RC*CaptureThm_00122
  131. BIN captures/*RC*CaptureThm_00123
  132. BIN captures/*RC*CaptureThm_00124
  133. BIN captures/*RC*CaptureTmp_1
  134. BIN captures/*RC*CaptureTmp_10
  135. BIN captures/*RC*CaptureTmp_100
  136. BIN captures/*RC*CaptureTmp_101
  137. BIN captures/*RC*CaptureTmp_102
  138. BIN captures/*RC*CaptureTmp_103
  139. BIN captures/*RC*CaptureTmp_104
  140. BIN captures/*RC*CaptureTmp_105
  141. BIN captures/*RC*CaptureTmp_106
  142. BIN captures/*RC*CaptureTmp_107
  143. BIN captures/*RC*CaptureTmp_108
  144. BIN captures/*RC*CaptureTmp_109
  145. BIN captures/*RC*CaptureTmp_11
  146. BIN captures/*RC*CaptureTmp_110
  147. BIN captures/*RC*CaptureTmp_111
  148. BIN captures/*RC*CaptureTmp_112
  149. BIN captures/*RC*CaptureTmp_113
  150. BIN captures/*RC*CaptureTmp_114
  151. BIN captures/*RC*CaptureTmp_115
  152. BIN captures/*RC*CaptureTmp_116
  153. BIN captures/*RC*CaptureTmp_117
  154. BIN captures/*RC*CaptureTmp_118
  155. BIN captures/*RC*CaptureTmp_119
  156. BIN captures/*RC*CaptureTmp_12
  157. BIN captures/*RC*CaptureTmp_120
  158. BIN captures/*RC*CaptureTmp_121
  159. BIN captures/*RC*CaptureTmp_122
  160. BIN captures/*RC*CaptureTmp_123
  161. BIN captures/*RC*CaptureTmp_124
  162. BIN captures/*RC*CaptureTmp_13
  163. BIN captures/*RC*CaptureTmp_14
  164. BIN captures/*RC*CaptureTmp_15
  165. BIN captures/*RC*CaptureTmp_16
  166. BIN captures/*RC*CaptureTmp_17
  167. BIN captures/*RC*CaptureTmp_18
  168. BIN captures/*RC*CaptureTmp_19
  169. BIN captures/*RC*CaptureTmp_2
  170. BIN captures/*RC*CaptureTmp_20
  171. BIN captures/*RC*CaptureTmp_21
  172. BIN captures/*RC*CaptureTmp_22
  173. BIN captures/*RC*CaptureTmp_23
  174. BIN captures/*RC*CaptureTmp_24
  175. BIN captures/*RC*CaptureTmp_25
  176. BIN captures/*RC*CaptureTmp_26
  177. BIN captures/*RC*CaptureTmp_27
  178. BIN captures/*RC*CaptureTmp_28
  179. BIN captures/*RC*CaptureTmp_29
  180. BIN captures/*RC*CaptureTmp_3
  181. BIN captures/*RC*CaptureTmp_30
  182. BIN captures/*RC*CaptureTmp_31
  183. BIN captures/*RC*CaptureTmp_32
  184. BIN captures/*RC*CaptureTmp_33
  185. BIN captures/*RC*CaptureTmp_34
  186. BIN captures/*RC*CaptureTmp_35
  187. BIN captures/*RC*CaptureTmp_36
  188. BIN captures/*RC*CaptureTmp_37
  189. BIN captures/*RC*CaptureTmp_38
  190. BIN captures/*RC*CaptureTmp_39
  191. BIN captures/*RC*CaptureTmp_4
  192. BIN captures/*RC*CaptureTmp_40
  193. BIN captures/*RC*CaptureTmp_41
  194. BIN captures/*RC*CaptureTmp_42
  195. BIN captures/*RC*CaptureTmp_43
  196. BIN captures/*RC*CaptureTmp_44
  197. BIN captures/*RC*CaptureTmp_45
  198. BIN captures/*RC*CaptureTmp_46
  199. BIN captures/*RC*CaptureTmp_47
  200. BIN captures/*RC*CaptureTmp_48
  201. BIN captures/*RC*CaptureTmp_49
  202. BIN captures/*RC*CaptureTmp_5
  203. BIN captures/*RC*CaptureTmp_50
  204. BIN captures/*RC*CaptureTmp_51
  205. BIN captures/*RC*CaptureTmp_52
  206. BIN captures/*RC*CaptureTmp_53
  207. BIN captures/*RC*CaptureTmp_54
  208. BIN captures/*RC*CaptureTmp_55
  209. BIN captures/*RC*CaptureTmp_56
  210. BIN captures/*RC*CaptureTmp_57
  211. BIN captures/*RC*CaptureTmp_58
  212. BIN captures/*RC*CaptureTmp_59
  213. BIN captures/*RC*CaptureTmp_6
  214. BIN captures/*RC*CaptureTmp_60
  215. BIN captures/*RC*CaptureTmp_61
  216. BIN captures/*RC*CaptureTmp_62
  217. BIN captures/*RC*CaptureTmp_63
  218. BIN captures/*RC*CaptureTmp_64
  219. BIN captures/*RC*CaptureTmp_65
  220. BIN captures/*RC*CaptureTmp_66
  221. BIN captures/*RC*CaptureTmp_67
  222. BIN captures/*RC*CaptureTmp_68
  223. BIN captures/*RC*CaptureTmp_69
  224. BIN captures/*RC*CaptureTmp_7
  225. BIN captures/*RC*CaptureTmp_70
  226. BIN captures/*RC*CaptureTmp_71
  227. BIN captures/*RC*CaptureTmp_72
  228. BIN captures/*RC*CaptureTmp_73
  229. BIN captures/*RC*CaptureTmp_74
  230. BIN captures/*RC*CaptureTmp_75
  231. BIN captures/*RC*CaptureTmp_76
  232. BIN captures/*RC*CaptureTmp_77
  233. BIN captures/*RC*CaptureTmp_78
  234. BIN captures/*RC*CaptureTmp_79
  235. BIN captures/*RC*CaptureTmp_8
  236. BIN captures/*RC*CaptureTmp_80
  237. BIN captures/*RC*CaptureTmp_81
  238. BIN captures/*RC*CaptureTmp_82
  239. BIN captures/*RC*CaptureTmp_83
  240. BIN captures/*RC*CaptureTmp_84
  241. BIN captures/*RC*CaptureTmp_85
  242. BIN captures/*RC*CaptureTmp_86
  243. BIN captures/*RC*CaptureTmp_87
  244. BIN captures/*RC*CaptureTmp_88
  245. BIN captures/*RC*CaptureTmp_89
  246. BIN captures/*RC*CaptureTmp_9
  247. BIN captures/*RC*CaptureTmp_90
  248. BIN captures/*RC*CaptureTmp_91
  249. BIN captures/*RC*CaptureTmp_92
  250. BIN captures/*RC*CaptureTmp_93
  251. BIN captures/*RC*CaptureTmp_94
  252. BIN captures/*RC*CaptureTmp_95
  253. BIN captures/*RC*CaptureTmp_96
  254. BIN captures/*RC*CaptureTmp_97
  255. BIN captures/*RC*CaptureTmp_98
  256. BIN captures/*RC*CaptureTmp_99
  257. BIN captures_tests/Capture_0001 copy.jpg
  258. BIN captures_tests/Capture_0001.jpg
  259. BIN captures_tests/Capture_0001.tif
  260. +1 −1 config.txt
  261. +5 −0 config.txt.orig
  262. +40 −10 illumination.py
  263. +112 −0 illumination/illumination.pde
  264. +112 −0 illumination_2switches/illumination_2switches.pde
  265. +525 −34 output.html
  266. +622 −0 output.html.orig
View
BIN .DS_Store.orig
Binary file not shown.
View
78 AnalogInOutSerial/AnalogInOutSerial.pde
@@ -0,0 +1,78 @@
+/*
+
+ Illumination switch and pressure sensor.
+
+ */
+
+// These constants won't change. They're used to give names
+// to the pins used:
+const int analogInPin1 = A0; // Analog input pin that the potentiometer is attached to
+const int analogInPin2 = A5; // Analog output pin that the LED is attached to
+const int pressureThreshold = 350;
+const int switchthreshold = 350;
+int sensor1Value = 0; // value read from the pot
+int sensor2Value = 0; // value output to the PWM (analog out)
+int lastval = 0;
+//int output1Value = 0; // value read from the pot
+//int output2Value = 0; // value output to the PWM (analog out)
+int NOTHING = 0;
+int OPEN = 1;// clip is open, in transit (fsr low, switch low)
+int EMPTY = 2;// # clip is closed, no paper in (fsr high, switch high)
+int READY = 3;// # clip is closed, paper in place (fsr high, switch low)
+
+boolean debug = true;
+
+
+void setup() {
+ // initialize serial communications at 9600 bps:
+ Serial.begin(9600);
+}
+
+void loop() {
+ int returnval = NOTHING;
+ // read the analog in value:
+ sensor1Value = analogRead(analogInPin1);
+
+ sensor2Value = analogRead(analogInPin2);
+
+ if(debug){
+ Serial.print("sensor1Value: ");
+ Serial.println(sensor1Value);
+ //Serial.print("sensor2Value: "+sensor2Value);
+ }
+ if (sensor2Value < switchthreshold) {
+ returnval = OPEN;
+ if (sensor1Value > pressureThreshold){
+ returnval = READY;
+ }
+ }
+ else {
+ returnval = EMPTY;
+ }
+ if (lastval != returnval){
+ lastval = returnval;
+ Serial.print(returnval);
+ }
+ // map it to the range of the analog out:
+ //output1Value = map(sensor1Value, 0, 1023, 0, 255);
+ //output2Value = map(sensor2Value, 0, 1023, 0, 255);
+ // change the analog out value:
+ //analogWrite(analogOutPin, outputValue);
+
+/*
+ // print the results to the serial monitor:
+ Serial.print("sensor1 = " );
+ Serial.print(sensor1Value);
+ Serial.print("\t sensor2 = " );
+ Serial.println(sensor2Value);
+ //Serial.print("\t output1 = ");
+ //Serial.print(output1Value);
+ //Serial.print("\t output2 = ");
+ //Serial.println(output2Value);
+*/
+
+ // wait 10 milliseconds before the next loop
+ // for the analog-to-digital converter to settle
+ // after the last reading:
+ delay(100);
+}
View
BIN ArduinoSerialProcessing$py.class
Binary file not shown.
View
BIN Illumination.workflow/Contents/QuickLook/Thumbnail.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
2 Illumination.workflow/Contents/document.wflow
@@ -253,7 +253,7 @@ java -d32 -jar -Xmx500M processing/processing-py.jar illumination.py
</array>
</dict>
<key>windowFrame</key>
- <string>{{0, 91}, {1000, 735}}</string>
+ <string>{{84, 43}, {1000, 735}}</string>
<key>workflowViewScrollPosition</key>
<string>{{0, 0}, {619, 467}}</string>
</dict>
View
BIN MarkovGenerator$py.class
Binary file not shown.
View
7 README (Autosaved).txt
@@ -0,0 +1,7 @@
+Illumination
+============
+
+Launch RemoteCapture
+
+to run from console:
+java -d32 -jar -Xmx500M processing/processing-py.jar illumination.py
View
9 README.md
@@ -1,2 +1,9 @@
Illumination
-============
+============
+
+Launch RemoteCapture
+
+
+to run from console:
+java -d32 -jar -Xmx500M processing/processing-py.jar illumination.py
+
View
BIN captures/*RC*CaptureThm_00001
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00002
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00003
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00004
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00005
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00006
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00007
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00008
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00009
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00010
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00011
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00012
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00013
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00014
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00015
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00016
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00017
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00018
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00019
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00020
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00021
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00022
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00023
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00024
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00025
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00026
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00027
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00028
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00029
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00030
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00031
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00032
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00033
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00034
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00035
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00036
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00037
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00038
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00039
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00040
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00041
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00042
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00043
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00044
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00045
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00046
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00047
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00048
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00049
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00050
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00051
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00052
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00053
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00054
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00055
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00056
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00057
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00058
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00059
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00060
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00061
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00062
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00063
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00064
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00065
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00066
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00067
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00068
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00069
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00070
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00071
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00072
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00073
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00074
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00075
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00076
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00077
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00078
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00079
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00080
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00081
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00082
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00083
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00084
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00085
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00086
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00087
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00088
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00089
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00090
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00091
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00092
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00093
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00094
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00095
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00096
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00097
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00098
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00099
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00100
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00101
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00102
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00103
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00104
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00105
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00106
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00107
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00108
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00109
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00110
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00111
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00112
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00113
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00114
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00115
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00116
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00117
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00118
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00119
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00120
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00121
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00122
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00123
Binary file not shown.
View
BIN captures/*RC*CaptureThm_00124
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_1
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_10
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_100
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_101
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_102
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_103
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_104
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_105
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_106
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_107
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_108
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_109
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_11
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_110
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_111
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_112
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_113
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_114
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_115
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_116
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_117
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_118
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_119
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_12
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_120
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_121
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_122
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_123
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_124
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_13
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_14
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_15
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_16
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_17
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_18
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_19
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_2
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_20
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_21
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_22
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_23
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_24
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_25
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_26
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_27
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_28
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_29
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_3
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_30
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_31
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_32
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_33
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_34
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_35
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_36
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_37
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_38
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_39
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_4
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_40
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_41
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_42
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_43
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_44
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_45
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_46
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_47
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_48
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_49
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_5
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_50
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_51
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_52
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_53
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_54
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_55
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_56
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_57
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_58
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_59
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_6
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_60
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_61
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_62
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_63
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_64
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_65
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_66
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_67
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_68
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_69
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_7
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_70
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_71
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_72
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_73
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_74
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_75
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_76
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_77
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_78
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_79
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_8
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_80
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_81
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_82
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_83
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_84
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_85
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_86
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_87
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_88
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_89
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_9
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_90
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_91
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_92
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_93
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_94
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_95
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_96
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_97
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_98
Binary file not shown.
View
BIN captures/*RC*CaptureTmp_99
Binary file not shown.
View
BIN captures_tests/Capture_0001 copy.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN captures_tests/Capture_0001.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN captures_tests/Capture_0001.tif
Binary file not shown.
View
2 config.txt
@@ -1 +1 @@
-386,190,337,303
+567,145,534,397,0
View
5 config.txt.orig
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+386,190,337,303
+=======
+567,145,534,397,0
+>>>>>>> ee7b3230fc2316cddd703c53673f2e2aec4295eb
View
50 illumination.py
@@ -18,17 +18,20 @@
class Illuminate(object):
def setup(self):
- #instantiate class vars
- self.makePoems = False
- self.flipImage = False
+ #~~CONTROL VARS~~#
self.fadeAlpha = 4
self.fadeSpeed = 15
self.lightColor = [255,230,182]
+ self.speed = 300 #overall speed of showing each word
+ self.wordMargin = 3 #controls size of the box around the word
+
+ #instantiate class vars
+ self.makePoems = False
+ self.flipImage = False
+
#self.lightColor = 0xFFEF91
self.calibrate = False
- self.speed = 250
self.showImg = 1
- self.wordMargin = 3
self.boxList = []
self.currentBoxNum = [0]
self.lastTime = [0]
@@ -54,9 +57,10 @@ def setup(self):
self.imgPos = [int(calib[0]),int(calib[1])]
except:
#set default calib value
- calib = [507,324,535,297]
+ calib = [507,324,535,297,0]
self.imgPos = [int(calib[0]),int(calib[1])]
self.imgSize = [int(calib[2]),int(calib[3])]
+ self.imgRot = int(calib[4])
self.saveCalib();
#set screen
#setLocation(1280,0)
@@ -139,6 +143,7 @@ def loadNewImage(self):
self.capture() #convert to tiff
def draw(self):
+
#check the sensors
self.checkSensors()
@@ -155,9 +160,15 @@ def draw(self):
#print "self.lines: ",
#print self.lines
+ #set the rotation of the stage
+ pushMatrix();
+ rotate(float(radians(self.imgRot)))
+
if self.calibrate:
image(self.img, self.imgPos[0], self.imgPos[1], self.imgSize[0], self.imgSize[1])
-
+
+ popMatrix();
+
if self.makePoems:
if len(self.lines)>0:
@@ -191,20 +202,26 @@ def draw(self):
#print self.wordCnt
#print "line[self.wordCnt] ",
#print self.line[self.wordCnt]
+
+ #draw boxes for words
try:
+ pushMatrix();
+ rotate(float(radians(self.imgRot)))
self.lightWord(self.line[self.wordCnt])
- #self.lightNextMt()
+ popMatrix();
self.showTime = math.sqrt(self.getCurrentWordLength())*self.speed
except:
print "word out of range!"
self.wordCnt += 1
self.fadeAlpha = 2
self.lastTime[0] = millis()
fill(0,0,0,self.fadeAlpha)
+ #fade out
rect(0,0,width,height)
else:
#we gotta end it here, no more lines!
self.end()
+
def light(self):
@@ -345,12 +362,16 @@ def scale(self,x,y):
self.imgSize[0] += x
self.imgSize[1] += y
self.saveCalib()
+
+ def rotateStage(self,r):
+ self.imgRot += r
+ self.saveCalib()
def saveCalib(self):
print "save calib"
f = open('config.txt', 'r+')
f.truncate()
- calib = str(self.imgPos[0])+","+str(self.imgPos[1])+","+str(self.imgSize[0])+","+str(self.imgSize[1])
+ calib = str(self.imgPos[0])+","+str(self.imgPos[1])+","+str(self.imgSize[0])+","+str(self.imgSize[1])+","+str(self.imgRot)
print "calib: "+calib
f.write(calib)
f.close()
@@ -433,7 +454,16 @@ def keyPressed(self):
elif key==32:
#spacebar - run
self.onClick()
-
+ elif key==48:
+ #rotate right
+ self.rotateStage(-1);
+ elif key==57:
+ #rotate right
+ self.rotateStage(+1);
+ elif key=="i":
+ #display image toggle
+ self.calibrate = not self.calibrate
+
def mousePressed(self):
print "mouse pressed"
#self.onClick()
View
112 illumination/illumination.pde
@@ -0,0 +1,112 @@
+ const int fsrPin = 0; // Analog input pin that the potentiometer is attached to
+ const int switchPin = 2; //Digital input pin that the switch is attached to
+ int fsrValue = 0; // value read from the fsr
+ int switchValue = 0; // value read from the switch
+
+ const int OPEN = 1; // clip is open, in transit (fsr low, switch low)
+ const int EMPTY = 2; // clip is closed, no paper in (fsr high, switch high)
+ const int READY = 3; // clip is closed, paper in place (fsr high, switch low)
+ const int UNKNOWN = 4; // initial state
+
+ int state = UNKNOWN;
+
+ boolean debug = false;
+
+
+ void setup() {
+ pinMode(switchPin, INPUT);
+ // initialize serial communications at 9600 bps:
+ Serial.begin(9600);
+ }
+
+ void loop() {
+ int newState = UNKNOWN;
+
+ // measure inputs
+ fsrValue = analogRead(fsrPin); // read the fsr value
+ switchValue = digitalRead(switchPin); // read the switch value
+
+ // calculate current state
+ newState = calcState(fsrValue,switchValue);
+ if (debug){
+ Serial.print("state ");
+ Serial.println(state, DEC);
+ Serial.print("newState ");
+ Serial.println(newState, DEC);
+ Serial.print("fsr ");
+ Serial.println(fsrValue, DEC);
+ Serial.print("switch ");
+ Serial.println(switchValue, DEC);
+ //Serial.println(-1, DEC);
+ }
+ // calculate change. report if change detected
+ if (newState != state && newState != UNKNOWN){
+ if (debug){
+ Serial.print("change detected, old = ");
+ Serial.print(state, DEC);
+ Serial.print(", new = ");
+ Serial.println(newState, DEC);
+
+ }
+ delay(10);
+ // check again to make sure reading wasn't a fluke
+ if (newState == calcState(fsrValue,switchValue)){
+ state = newState;
+ if (debug){
+ Serial.print("Change reported, state = ");
+ Serial.println(state, DEC);
+ Serial.println("");
+ delay(2000);
+ }
+ //report change
+ Serial.print(state, DEC);
+ }
+ }
+ delay(20);
+ if (debug){
+ delay(1000);
+ }
+
+
+ /*
+ if(fsrValue>100){
+ // Serial.print(1, BYTE);
+ //Serial.println(sensorValue); // print the pot value back to the debugger pane
+ }
+ else{
+ //Serial.print(0);
+ }
+ delay(10); // wait 10 milliseconds before the next loop
+ */
+
+ }
+
+ int calcState(int fsr, int sw){
+ int newState = UNKNOWN;
+ if (fsr > 100 && sw == HIGH){
+ newState = EMPTY;
+ if (debug){
+ Serial.println("EMPTY");
+ }
+ }
+ else if (fsr > 100 && sw == LOW){
+ newState = READY;
+ if (debug){
+ Serial.println("READY");
+ }
+ }
+ else if (fsr < 100 && sw == LOW){
+ newState = OPEN;
+ if (debug){
+ Serial.println("OPEN");
+ }
+ }
+ else {
+ //error
+ newState = UNKNOWN;
+ if (debug){
+ Serial.println("ERROR");
+ }
+ }
+ return newState;
+ }
View
112 illumination_2switches/illumination_2switches.pde
@@ -0,0 +1,112 @@
+ const int fsrPin = 3; // Analog input pin that the potentiometer is attached to
+ const int switchPin = 2; //Digital input pin that the switch is attached to
+ int fsrValue = 0; // value read from the fsr
+ int switchValue = 0; // value read from the switch
+
+ const int OPEN = 1; // clip is open, in transit (fsr low, switch low)
+ const int EMPTY = 2; // clip is closed, no paper in (fsr high, switch high)
+ const int READY = 3; // clip is closed, paper in place (fsr high, switch low)
+ const int UNKNOWN = 4; // initial state
+
+ int state = UNKNOWN;
+
+ boolean debug = false;
+
+
+ void setup() {
+ pinMode(switchPin, INPUT);
+ // initialize serial communications at 9600 bps:
+ Serial.begin(9600);
+ }
+
+ void loop() {
+ int newState = UNKNOWN;
+
+ // measure inputs
+ fsrValue = digitalRead(fsrPin); // read the fsr value
+ switchValue = digitalRead(switchPin); // read the switch value
+
+ // calculate current state
+ newState = calcState(fsrValue,switchValue);
+ /* if (debug){
+ Serial.print("state ");
+ Serial.println(state, DEC);
+ Serial.print("newState ");
+ Serial.println(newState, DEC);
+ Serial.print("fsr ");
+ Serial.println(fsrValue, DEC);
+ Serial.print("switch ");
+ Serial.println(switchValue, DEC);
+ //Serial.println(-1, DEC);
+ }*/
+ // calculate change. report if change detected
+ if (newState != state && newState != UNKNOWN){
+ if (debug){
+ Serial.print("change detected, old = ");
+ Serial.print(state, DEC);
+ Serial.print(", new = ");
+ Serial.println(newState, DEC);
+
+ }
+ delay(10);
+ // check again to make sure reading wasn't a fluke
+ if (newState == calcState(fsrValue,switchValue)){
+ state = newState;
+ if (debug){
+ Serial.print("Change reported, state = ");
+ Serial.println(state, DEC);
+ Serial.println("");
+ delay(2000);
+ }
+ //report change
+ // Serial.print(state, DEC);
+ }
+ }
+ delay(20);
+ if (debug){
+ delay(1000);
+ }
+
+
+ /*
+ if(fsrValue>100){
+ // Serial.print(1, BYTE);
+ //Serial.println(sensorValue); // print the pot value back to the debugger pane
+ }
+ else{
+ //Serial.print(0);
+ }
+ delay(10); // wait 10 milliseconds before the next loop
+ */
+
+ }
+
+ int calcState(int fsr, int sw){
+ int newState = UNKNOWN;
+ if (fsr == HIGH && sw == HIGH){
+ newState = EMPTY;
+ if (debug){
+ Serial.println("EMPTY");
+ }
+ }
+ else if (fsr == HIGH && sw == LOW){
+ newState = READY;
+ if (debug){
+ Serial.println("READY");
+ }
+ }
+ else if (fsr == LOW && sw == LOW){
+ newState = OPEN;
+ if (debug){
+ Serial.println("OPEN");
+ }
+ }
+ else {
+ //error
+ newState = UNKNOWN;
+ if (debug){
+ Serial.println("ERROR");
+ }
+ }
+ return newState;
+ }
View
559 output.html
525 additions, 34 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
622 output.html.orig
622 additions, 0 deletions not shown because the diff is too large. Please use a local Git client to view these changes.

0 comments on commit c935d36

Please sign in to comment.
Something went wrong with that request. Please try again.