Merge branch 'master' of github.com:c3d2/pentabug into alexdev

Conflicts:
	README.md

README.md

@@ -16,4 +16,3 @@ Img. 2: The top layer view of the Version 1.0 production board (two layer pcb).
 Img. 3: Version 1.0 schematics ([high resolution image](https://github.com/c3d2/pentabug/raw/master/img/schematics_v1_0.png "high resolution image of schematics")).
 
 [Bill of Materials for Version 1.0](https://github.com/c3d2/pentabug/blob/master/bom.md "bill of materials")
-

bom.md

@@ -1,31 +1,57 @@
-# kostenkalkulation für 100 bausätze:
+# Parts List
 
-name 		ben.Anzahl 	quelle/bestnr. 		einzelpreis(cent) 	summe(Euro)
---------- 	----------- 	--------------  	----------------- 	--------------
-ATMEGA88PA 	100 		mouser 			144 			144
-Batteriefach 	50 		hbc 			74 			~40
-motor(schwarz) 	100 		pollin 			125 			125
-buzzr 		100 		mouser 			49			49
-widerst. 	400 		reichelt 		2.5 			10
-2n7000 		100 		reichelt 		5 			5
-C 100nF 	300 		reichelt 		7 			21
-head1x3 	100 		reichelt? 		7 			7
-head2x3 	100 		reichelt? 		15 			15
-ledSLH 56 	200 		reichelt 		7 			14
-platine 	100 		mkpcb? 			150? 			~150
-stahl.8mm 	25 		conrad 			50 			12.5
-lötzinn 	1 		pollin 			795 			8
-flyerA5 	100 		diekopie?  		3 			3
-tüte 		100 		todo 			5 			5
-glitzer 	100 		todo 			20 			20
-glitter 	100 		todo 			20 			20
-verbrauchsm     4  		dealer 			250 			10
-aterial 	4 		dealer2 		250 			10
-buzz variante   100 		reichelt 		10 			10
+<table>
+<tr><th>Bezeichnung	</th><th>Bauteil</th><th>Hinweis</th></tr>
+<tr><td>n/a		</td><td>Leiterplatte V1.0		</td><td></td><tr>
+<tr><td>IC1		</td><td>Mikrocontroller ATMEGA88PA	</td><td>Einbaulage beachten</td><tr>
+<tr><td>R1		</td><td>Widerstand 100K		</td><td>braun-schwarz-schwarz-gelb-braun</td><tr>
+<tr><td>R2		</td><td>Widerstand 22K			</td><td>rot-rot-scharz-rot-braun</td><tr>
+<tr><td>R3		</td><td>Widerstand 10K			</td><td>braun-schwarz-schwarz-rot-braun</td><tr>
+<tr><td>Q1		</td><td>Transistor 2N7000		</td><td>Einbaulage beachten</td><tr>
+<tr><td>C1, C2, C3	</td><td>Keramikkondensator 100nF	</td><td></td><tr>
+<tr><td>LED1, LED2	</td><td>LED rot			</td><td>Polarität beachten</td><tr>
+<tr><td>SG1		</td><td>Piezo Buzzer			</td><td></td><tr>
+<tr><td>JP1		</td><td>Stiftleiste 1x3		</td><td></td><tr>
+<tr><td>JP2		</td><td>Stiftleiste 2x3		</td><td></td><tr>
+<tr><td>S1, S2		</td><td>Taster				</td><td></td><tr>
+<tr><td>M1		</td><td>Motor				</td><td></td><tr>
+<tr><td>BAT1		</td><td>Batteriefach			</td><td>erst nach Test auf Platinenunterseite montieren</td><tr>
+</table>
+
+
+# cost calculation for 100 kits:
+
+<pre><code>
+name		description 	ben.Anzahl 	quelle/bestnr. 		einzelpreis(cent) 	summe(Euro)
+---------	--------- 	----------- 	--------------  	----------------- 	--------------
+IC1		ATMEGA88PA 	100 		mouser 			144 			144
+BAT1		Batteriefach 	50 		hbc 			74 			~40
+M1		motor(schwarz) 	100 		pollin 			125 			125
+SG1		piezo buzzer	100 		mouser 			49			49
+R1, R2, R3	widerst. 	300 		reichelt 		2.5 			7.50
+Q1		2n7000 		100 		reichelt 		5 			5
+C1, C2, C3	100nF 		300 		reichelt 		7 			21
+JP1		head1x3 	100 		reichelt? 		7 			7
+JP2		head2x3 	100 		reichelt? 		15 			15
+LED1, LED2	ledSLH 56 	200 		reichelt 		7 			14
+S1, S2		tacswitch	200		???			???			???
+n/a		platine 	100 		mkpcb? 			150? 			~150
+n/a		stahl.8mm 	25 		conrad 			50 			12.5
+n/a		lötzinn 	1 		pollin 			795 			8
+n/a		flyerA5 	100 		diekopie?  		3 			3
+n/a		tüte 		100 		todo 			5 			5
+n/a		glitzer 	100 		todo 			20 			20
+n/a		glitter 	100 		todo 			20 			20
+n/a		verbrauchsm     4  		dealer 			250 			10
+n/a		aterial 	4 		dealer2 		250 			10
+n/a		buzz variante   100 		reichelt 		10 			10
+n/a		schmelzkleber 	1 		? 			1000 			10
+n/a		sonstiges 	1 		dealer3 		115 			11.5
 												summe:
 											------------------------
-										678.5
+
 										
 ------------------------------------------------------------------------------------------------
 
-
+<code>										700
+</pre>