Compare commits
	
		
			19 Commits
		
	
	
		
			labelgenv0
			...
			069d2175d9
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 069d2175d9 | |||
| 9b1b92e21d | |||
| ee0f8f4250 | |||
| 9c9435570b | |||
| 1bf10f7349 | |||
| 3c8d6c7ad3 | |||
| cbe7225fc9 | |||
| 44efc4006e | |||
| 218303e92b | |||
| e5d3f87b5c | |||
| 2ab1d0dbb3 | |||
| 1338c3f440 | |||
| 83b077b4df | |||
| f16242f5be | |||
| 2f28a01b7c | |||
| fb85a56d47 | |||
| bec0c63763 | |||
|  | 4ae30b82a0 | ||
|  | 4bc3e30116 | 
							
								
								
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -15,7 +15,7 @@ output.mp4 | |||||||
| # log files | # log files | ||||||
| output.log | output.log | ||||||
| # images | # images | ||||||
| *.png | map*.png | ||||||
| # Built app | # Built app | ||||||
| build | build | ||||||
| # Generated label images | # Generated label images | ||||||
|   | |||||||
							
								
								
									
										
											BIN
										
									
								
								GothamCond-Medium.otf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								GothamCond-Medium.otf
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								belden-logo-superhires.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								belden-logo-superhires.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 448 KiB | 
							
								
								
									
										41
									
								
								belden-logo.svg
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										41
									
								
								belden-logo.svg
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,41 @@ | |||||||
|  | <?xml version="1.0" encoding="utf-8"?> | ||||||
|  | <!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  --> | ||||||
|  | <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" | ||||||
|  | 	 viewBox="0 0 446.6 151.4" style="enable-background:new 0 0 446.6 151.4;" xml:space="preserve"> | ||||||
|  | <style type="text/css"> | ||||||
|  | 	.st0{fill:#004990;} | ||||||
|  | </style> | ||||||
|  | <g> | ||||||
|  | 	<g> | ||||||
|  | 		<path class="st0" d="M21.2,32.1h-1.4v87.2H55c20.3,0,32-9.1,32-24.9c0-12.3-5.6-19.7-15.8-22.1c5.1-3.6,7.8-9.1,7.8-16.9 | ||||||
|  | 			c0-15.5-8.9-23.3-26.5-23.3H21.2z M44.7,51.6c7.4,0,11.4,1.1,11.4,6.8c0,4.8-3.1,6.8-10.5,6.8c0,0-0.6,0-1.1,0 | ||||||
|  | 			c0-2.1,0-11.5,0-13.6C44.5,51.6,44.7,51.6,44.7,51.6z M45.4,84.4l1.8,0c4.6,0,10.3-0.1,13,2.6c1.2,1.2,1.8,2.9,1.8,5.2 | ||||||
|  | 			c0,2-0.6,3.5-1.7,4.7c-3,3-9.2,2.9-13.8,2.9c0,0-1.4,0-2.1,0c0-2.1,0-13.3,0-15.4C44.9,84.4,45.4,84.4,45.4,84.4z"/> | ||||||
|  | 		<g> | ||||||
|  | 			<path class="st0" d="M139.8,32.1H90.4v87.2h50.8V98c0,0-23.7,0-26.1,0c0-2,0-9.8,0-11.8c2.4,0,24.8,0,24.8,0V64.8 | ||||||
|  | 				c0,0-22.3,0-24.8,0c0-2,0-9.4,0-11.4c2.5,0,26.1,0,26.1,0V32.1H139.8z"/> | ||||||
|  | 		</g> | ||||||
|  | 		<g> | ||||||
|  | 			<path class="st0" d="M169.3,32.1H146v87.2h51V98c0,0-23.9,0-26.3,0c0-2.6,0-65.9,0-65.9H169.3z"/> | ||||||
|  | 		</g> | ||||||
|  | 		<g> | ||||||
|  | 			<path class="st0" d="M332.4,32.1H283v87.2h50.8V98c0,0-23.7,0-26.1,0c0-2,0-9.8,0-11.8c2.4,0,24.8,0,24.8,0V64.8 | ||||||
|  | 				c0,0-22.3,0-24.8,0c0-2,0-9.4,0-11.4c2.5,0,26.1,0,26.1,0V32.1H332.4z"/> | ||||||
|  | 		</g> | ||||||
|  | 		<g> | ||||||
|  | 			<path class="st0" d="M424.6,32.1h-23.3c0,0,0,43,0,49.3c-4-5.1-38.4-49.3-38.4-49.3h-24v87.2h24.7c0,0,0-43.1,0-49.5 | ||||||
|  | 				c4,5.1,38.4,49.5,38.4,49.5h24V32.1H424.6z"/> | ||||||
|  | 		</g> | ||||||
|  | 		<g> | ||||||
|  | 			<g> | ||||||
|  | 				<path class="st0" d="M233.8,32.1h-32.5v87.2h32.5c24.4,0,44.3-19.6,44.3-43.6C278.1,51.7,258.2,32.1,233.8,32.1z M226,53.5 | ||||||
|  | 					c13.6,0.3,22,8.7,22,22.2c0,13.6-8.2,21.9-22,22.2V53.5z M231.5,101.3c12.5-3,20.7-10.7,20.8-25.7c-0.2-15-8.3-22.7-20.8-25.7 | ||||||
|  | 					c14,2.1,25,9.5,25,25.6v0.1C256.5,91.8,245.5,99.2,231.5,101.3z M260.2,75.6c-0.2-18-10-29.8-24.9-33.3 | ||||||
|  | 					c16.7,2.5,29.6,14,29.6,33.3c0,0,0,0,0,0.1h0c0,19.3-13,30.7-29.7,33.2C250.1,105.3,260,93.6,260.2,75.6z M240.3,115.7 | ||||||
|  | 					c16.7-4.7,28.3-19.2,28.5-39.9v-0.3c-0.2-20.7-11.9-35.1-28.5-39.8c19,3.9,33.5,17.7,33.6,39.7v0.4 | ||||||
|  | 					C273.9,97.9,259.4,111.8,240.3,115.7z"/> | ||||||
|  | 			</g> | ||||||
|  | 		</g> | ||||||
|  | 	</g> | ||||||
|  | </g> | ||||||
|  | </svg> | ||||||
| After Width: | Height: | Size: 2.2 KiB | 
							
								
								
									
										21
									
								
								get_specs.py
									
									
									
									
									
								
							
							
						
						
									
										21
									
								
								get_specs.py
									
									
									
									
									
								
							| @@ -70,6 +70,8 @@ def query_search(partnum, source): | |||||||
|                 if idx < 0: |                 if idx < 0: | ||||||
|                     fprint("Could not find part in API: " + partnum) |                     fprint("Could not find part in API: " + partnum) | ||||||
|                     return False |                     return False | ||||||
|  |                  | ||||||
|  |                 name = a["results"][idx]["title"] | ||||||
|                 #fprint("Search result found: result " + str(idx) + ", for ID " + name) |                 #fprint("Search result found: result " + str(idx) + ", for ID " + name) | ||||||
|                 #urlname = a["results"][0]["raw"]["catalogitemurlname"] |                 #urlname = a["results"][0]["raw"]["catalogitemurlname"] | ||||||
|                 img = a["results"][idx]["raw"]["catalogitemimageurl"] |                 img = a["results"][idx]["raw"]["catalogitemimageurl"] | ||||||
| @@ -279,6 +281,7 @@ def get_multi(partnums, delay=0.25, dir="cables/", cache=True): | |||||||
|             return out |             return out | ||||||
|  |  | ||||||
|         def run_search(partnum): |         def run_search(partnum): | ||||||
|  |             partnum = partnum.replace("%20", " ") # undo URL encoding | ||||||
|             oldpartnum = partnum |             oldpartnum = partnum | ||||||
|             if dstype == "Alphawire": |             if dstype == "Alphawire": | ||||||
|                 # For alphawire, sanitize the part number for only the final result check, because their API is very wierd |                 # For alphawire, sanitize the part number for only the final result check, because their API is very wierd | ||||||
| @@ -405,6 +408,7 @@ if __name__ == "__main__": | |||||||
|     # ] |     # ] | ||||||
|     partnums = [ |     partnums = [ | ||||||
|     # Actual cables in Jukebox |     # Actual cables in Jukebox | ||||||
|  |       | ||||||
|     "AW86104CY", |     "AW86104CY", | ||||||
|     "AW3050", |     "AW3050", | ||||||
|     "AW6714", |     "AW6714", | ||||||
| @@ -437,7 +441,7 @@ if __name__ == "__main__": | |||||||
|  |  | ||||||
|     # Some ones I picked, including some invalid ones |     # Some ones I picked, including some invalid ones | ||||||
|     "BL10GXS12",  |     "BL10GXS12",  | ||||||
|     "BLRST 5L-RKT 5L-949",  |     "BLRST%205L-RKT%205L-949", | ||||||
|     "BL10GXS13", |     "BL10GXS13", | ||||||
|     "BL10GXW12", |     "BL10GXW12", | ||||||
|     "BL10GXW13", |     "BL10GXW13", | ||||||
| @@ -448,13 +452,18 @@ if __name__ == "__main__": | |||||||
|     "BLFISD012R9", |     "BLFISD012R9", | ||||||
|     "BLFDSD012A9", |     "BLFDSD012A9", | ||||||
|     "BLFSSL024NG", |     "BLFSSL024NG", | ||||||
|     "BLFISX006W0", |     "BLFISX006W0", # datasheet only | ||||||
|     "BLFISX00103", |     "BLFISX00103", # invalid | ||||||
|     "BLC6D1100007" |     "BLC6D1100007" # invalid | ||||||
|  |  | ||||||
|     ] |     ] | ||||||
|     print(query_search("74002", "Belden")) |     #print(query_search("TT-SLG-024-HTNN", "Belden")) | ||||||
|     #get_multi(partnums, 0.25) |     from label_generator import gen_label | ||||||
|  |     gen_label("BLTF-SD9-006-RI5") | ||||||
|  |     gen_label("BLRA500P") | ||||||
|  |     gen_label("AWFIT-221-1_4") | ||||||
|  |     gen_label("BLRST 5L-RKT 5L-949") | ||||||
|  |     get_multi(partnums, 0.25) | ||||||
|     #query_search("10GXS13", "Belden") |     #query_search("10GXS13", "Belden") | ||||||
|  |  | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1 +0,0 @@ | |||||||
| <html>  <head>    <title>RGB Controller Configuration</title>    <style>      body { background-color: #cccccc; font-family: Arial, Helvetica, Sans-Serif; Color: #000088; }    </style>  </head>  <body>    <h1>RGB Controller Configuration</h1><br>    <h2>Set IP address</h2>    Needs reboot to apply<br>    Set to 0.0.0.0 for DHCP    <form method="post" enctype="application/x-www-form-urlencoded" action="/postform/">      <input type="text" name="ipa" value="0" size="3">.      <input type="text" name="ipb" value="0" size="3">.      <input type="text" name="ipc" value="0" size="3">.      <input type="text" name="ipd" value="0" size="3">      <input type="submit" value="Set">    </form><br>    <h2>Set Hostname</h2>    Needs reboot to apply<br>    Max 64 characters    <form method="post" enctype="application/x-www-form-urlencoded" action="/postform/">      <input type="text" name="hostname" value="RGBController" size="20">      <input type="submit" value="Set">    </form><br>    <h2>DMX512 Start Universe</h2>    Applies immediately<br>    Between (inclusive) 1-65000    <form method="post" enctype="application/x-www-form-urlencoded" action="/postform/">      <input type="text" name="universe" value="1" size="5">      <input type="submit" value="Set">    </form><br>    <form method="post" enctype="application/x-www-form-urlencoded" action="/postform/">      <input type="submit" name="reboot" value="Reboot">    </form><br>  </body></html> |  | ||||||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| @@ -61,9 +61,15 @@ def input_cable(): | |||||||
|             imgstr = "BL" |             imgstr = "BL" | ||||||
|         elif output[1] == "Alphawire": |         elif output[1] == "Alphawire": | ||||||
|             imgstr = "AW" |             imgstr = "AW" | ||||||
|         img = generate_code(imgstr + output[0]) |         gen_label(imgstr + output[0]) | ||||||
|         os.makedirs("labels", exist_ok=True) |         #img = generate_code(imgstr + output[0]) | ||||||
|         img.save("labels/" + imgstr + output[0] + ".png") |         #os.makedirs("labels", exist_ok=True) | ||||||
|  |         #img.save("labels/" + imgstr + output[0] + ".png") | ||||||
|  |  | ||||||
|  | def gen_label(partnum, path="labels"): | ||||||
|  |     img = generate_code(partnum) | ||||||
|  |     os.makedirs(path, exist_ok=True) | ||||||
|  |     img.save(path + "/" + partnum + ".png") | ||||||
|  |  | ||||||
| def delete_folder(path): | def delete_folder(path): | ||||||
|     # Check if the path is a directory |     # Check if the path is a directory | ||||||
|   | |||||||
| @@ -3,8 +3,13 @@ from util import fprint | |||||||
|  |  | ||||||
| from PIL import Image | from PIL import Image | ||||||
| from PIL import ImageDraw | from PIL import ImageDraw | ||||||
|  | from PIL import ImageFont | ||||||
| #import cv2 | #import cv2 | ||||||
| import numpy as np | import numpy as np | ||||||
|  | from util import find_data_file | ||||||
|  | import segno | ||||||
|  | import io | ||||||
|  | #import cairosvg | ||||||
| #import math | #import math | ||||||
|  |  | ||||||
|  |  | ||||||
| @@ -134,7 +139,8 @@ for charset in (CODE128A, CODE128B): | |||||||
|  |  | ||||||
| def generate_code(data, show=False, check=False): | def generate_code(data, show=False, check=False): | ||||||
|  |  | ||||||
|     img = code128_image(data) |     #img = code128_image(data) | ||||||
|  |     img = qr_image(data) | ||||||
|     if show: |     if show: | ||||||
|         img.show() |         img.show() | ||||||
|     #img.show() |     #img.show() | ||||||
| @@ -198,6 +204,7 @@ def code128_format(data): | |||||||
|     return codes |     return codes | ||||||
|  |  | ||||||
| def code128_image(data, height=100, thickness=3, quiet_zone=False): | def code128_image(data, height=100, thickness=3, quiet_zone=False): | ||||||
|  |     partnum = data | ||||||
|     if not data[-1] == CODE128B['Stop']: |     if not data[-1] == CODE128B['Stop']: | ||||||
|         data = code128_format(data) |         data = code128_format(data) | ||||||
|          |          | ||||||
| @@ -227,12 +234,86 @@ def code128_image(data, height=100, thickness=3, quiet_zone=False): | |||||||
|  |  | ||||||
|     #draw.arc(((width - width/5, width - width/5), (width*9 + width/5, width*9 + width/5)),0,360,fill='blue', width = int(width/8)) |     #draw.arc(((width - width/5, width - width/5), (width*9 + width/5, width*9 + width/5)),0,360,fill='blue', width = int(width/8)) | ||||||
|     draw.arc(((width+int(width / 1.4), width+int(width / 1.4)), (width*9-int(width / 1.4), width*9-int(width / 1.4))),0,360,fill='blue', width = int(width/8)) |     draw.arc(((width+int(width / 1.4), width+int(width / 1.4)), (width*9-int(width / 1.4), width*9-int(width / 1.4))),0,360,fill='blue', width = int(width/8)) | ||||||
|  |     font_path = find_data_file("OCRAEXT.TTF")  | ||||||
|  |     font_size = width/2 | ||||||
|  |     font = ImageFont.truetype(font_path, font_size) | ||||||
|  |     text_width = font.getlength(partnum) | ||||||
|  |     while text_width > width*4: | ||||||
|  |         font_size -= 1 | ||||||
|  |         font = ImageFont.truetype(font_path, font_size) | ||||||
|  |         text_width = font.getlength(partnum) | ||||||
|  |  | ||||||
|  |     txtx = (int(width * 10) - text_width) / 2 | ||||||
|  |     txty = (int(width * 10)) / 2 + width / 2 | ||||||
|  |  | ||||||
|  |     draw.text((txtx,txty),partnum, "black", font) | ||||||
|  |     return img | ||||||
|  |  | ||||||
|  | def qr_image(data, width=600): | ||||||
|  |     partnum = data | ||||||
|  |      | ||||||
|  |  | ||||||
|  |  | ||||||
|  |     # Monochrome Image | ||||||
|  |     img  = Image.new('RGB', (int(width * 10), int(width * 10)), 'white') | ||||||
|  |     draw = ImageDraw.Draw(img) | ||||||
|  |      | ||||||
|  |  | ||||||
|  |  | ||||||
|  |     #svg_path = find_data_file("belden-logo.svg") | ||||||
|  |     #with open(svg_path, 'rb') as svg_file: | ||||||
|  |     #    png_image = cairosvg.svg2png(file_obj=svg_file,dpi=width*30, scale=30, background_color="white") | ||||||
|  |     #with open("output.png", 'wb') as file: | ||||||
|  |     #    file.write(png_image) | ||||||
|  |  | ||||||
|  |     png_image_io = "belden-logo-superhires.png" | ||||||
|  |     png_image_pillow = Image.open(png_image_io) | ||||||
|  |     png_width, png_height = png_image_pillow.size | ||||||
|  |     png_image_pillow = png_image_pillow.resize((int(width*5.2), int(width*5.2/png_width*png_height))) | ||||||
|  |     png_width, png_height = png_image_pillow.size | ||||||
|  |     # paste belden logo first because it has a big border that would cover stuff up | ||||||
|  |     img.paste(png_image_pillow, (int(width*5-png_width/2), int(width*4.25 - png_height/2))) | ||||||
|  |  | ||||||
|  |     # draw circle border | ||||||
|  |     #draw.arc(((width - width/5, width - width/5), (width*9 + width/5, width*9 + width/5)),0,360,fill='blue', width = int(width/8)) | ||||||
|  |     draw.arc(((width+int(width / 1.4), width+int(width / 1.4)), (width*9-int(width / 1.4), width*9-int(width / 1.4))),0,360,fill=(0, 73,144), width = int(width/8)) | ||||||
|  |      | ||||||
|  |     font_path = find_data_file("GothamCond-Medium.otf")  | ||||||
|  |     font_size = width/2 | ||||||
|  |     font = ImageFont.truetype(font_path, font_size) | ||||||
|  |     text_width = font.getlength(partnum[2:]) | ||||||
|  |     # shrink font dynamically if it's too long of a name | ||||||
|  |     while text_width > width*4: | ||||||
|  |         font_size -= 1 | ||||||
|  |         font = ImageFont.truetype(font_path, font_size) | ||||||
|  |         text_width = font.getlength(partnum[2:]) | ||||||
|  |  | ||||||
|  |     txtx = (int(width * 10) - text_width) / 2 | ||||||
|  |     txty = (int(width * 10)) / 2 | ||||||
|  |     # draw part number text | ||||||
|  |     draw.text((txtx,txty),partnum[2:], "black", font) | ||||||
|  |      | ||||||
|  |     # Draw QR code | ||||||
|  |     partnum = partnum.replace(" ", "%20") | ||||||
|  |     qrcode = segno.make('HTTPS://BLDN.APP/' + partnum,micro=False,boost_error=False,error="L",mask=3) | ||||||
|  |     out = io.BytesIO() | ||||||
|  |     qrx, _ = qrcode.symbol_size(1,0) | ||||||
|  |     qrcode.save(out, scale=width*2/qrx, kind="PNG", border=0) | ||||||
|  |     qrimg = Image.open(out) | ||||||
|  |     img.paste(qrimg, box=(int(width*4),int(width*5.75))) | ||||||
|  |  | ||||||
|  |      | ||||||
|     return img |     return img | ||||||
|  |  | ||||||
| if __name__ == "__main__": | if __name__ == "__main__": | ||||||
|     #print(generate_code("BL10GXS13")) |     #print(generate_code("BL10GXS13")) | ||||||
|     #print(generate_code("BL10GXgd35j35S13")) |     #print(generate_code("BL10GXgd35j35S13")) | ||||||
|     #print(generate_code("BL10GX54hS13")) |     #print(generate_code("BL10GX54hS13")) | ||||||
|     print(generate_code("BL10Gj34qXS13", False, False)) |     #print(generate_code("BL10Gj34qXS13", False, False)) | ||||||
|     #print(generate_code("BL104w5545dp7bfwp43643534/4563G-XS13")) |     #print(generate_code("BL104w5545dp7bfwp43643534/4563G-XS13")) | ||||||
|     #adjust_image(cv2.imread('test_skew.jpg')) |     #adjust_image(cv2.imread('test_skew.jpg')) | ||||||
|  |     path = "labels" | ||||||
|  |     img = generate_code("BL10GXS13") | ||||||
|  |     import os | ||||||
|  |     os.makedirs(path, exist_ok=True) | ||||||
|  |     img.save(path + "/" + "BL10GXS13" + ".png") | ||||||
							
								
								
									
										1204
									
								
								led_control.py
									
									
									
									
									
								
							
							
						
						
									
										1204
									
								
								led_control.py
									
									
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								map3.png
									
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								map3.png
									
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							| Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 41 KiB | 
| @@ -19,7 +19,7 @@ pandas | |||||||
| pyarrow | pyarrow | ||||||
| ghostscript | ghostscript | ||||||
| pyzbar | pyzbar | ||||||
|  | segno | ||||||
|  |  | ||||||
| # Development | # Development | ||||||
| matplotlib | matplotlib | ||||||
|   | |||||||
							
								
								
									
										12
									
								
								run.py
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								run.py
									
									
									
									
									
								
							| @@ -17,7 +17,7 @@ import signal | |||||||
| import socket | import socket | ||||||
| from flask import Flask, render_template, request | from flask import Flask, render_template, request | ||||||
| import requests | import requests | ||||||
| import led_control | from led_control import LEDSystem | ||||||
| import server | import server | ||||||
| import asyncio | import asyncio | ||||||
| import json | import json | ||||||
| @@ -36,7 +36,7 @@ killme = None | |||||||
| #pool = None | #pool = None | ||||||
| serverproc = None | serverproc = None | ||||||
| camera = None | camera = None | ||||||
|  | ledsys = None | ||||||
| to_server_queue = Queue() | to_server_queue = Queue() | ||||||
| from_server_queue = Queue() | from_server_queue = Queue() | ||||||
|  |  | ||||||
| @@ -47,6 +47,8 @@ def arm_start_callback(res): | |||||||
| def led_start_callback(res): | def led_start_callback(res): | ||||||
|     global led_ready |     global led_ready | ||||||
|     led_ready = True |     led_ready = True | ||||||
|  |     global ledsys | ||||||
|  |     ledsys = res | ||||||
|  |  | ||||||
| def camera_start_callback(res): | def camera_start_callback(res): | ||||||
|     global camera_ready |     global camera_ready | ||||||
| @@ -233,11 +235,13 @@ def setup_server(pool): | |||||||
|     global camera |     global camera | ||||||
|  |  | ||||||
|     pool.apply_async(ur5_control.init, (config["arm"]["ip"],), callback=arm_start_callback) |     pool.apply_async(ur5_control.init, (config["arm"]["ip"],), callback=arm_start_callback) | ||||||
|     pool.apply_async(led_control.init, callback=led_start_callback) |     global ledsys | ||||||
|  |     ledsys = LEDSystem() | ||||||
|  |     pool.apply_async(ledsys.init, callback=led_start_callback) | ||||||
|     #pool.apply_async(sensor_control.init, callback=sensor_start_callback) |     #pool.apply_async(sensor_control.init, callback=sensor_start_callback) | ||||||
|     serverproc = Process(target=start_server_socket) |     serverproc = Process(target=start_server_socket) | ||||||
|     serverproc.start() |     serverproc.start() | ||||||
|  |      | ||||||
|     if led_ready is False: |     if led_ready is False: | ||||||
|         fprint("waiting for " + "LED controller initialization" + " to complete...", sendqueue=to_server_queue) |         fprint("waiting for " + "LED controller initialization" + " to complete...", sendqueue=to_server_queue) | ||||||
|         while led_ready is False: |         while led_ready is False: | ||||||
|   | |||||||
| @@ -10,7 +10,7 @@ import opcode | |||||||
| import os | import os | ||||||
| import distutils | import distutils | ||||||
| #distutils_path = os.path.join(os.path.dirname(opcode.__file__), 'distutils') | #distutils_path = os.path.join(os.path.dirname(opcode.__file__), 'distutils') | ||||||
| build_exe_options = {"include_msvcr": True, "packages": ["camelot", "setuptools"], "optimize": 0, "silent": True, "include_files": ["gs10030w64.exe"], "excludes": ["scipy", "torch"]} | build_exe_options = {"include_msvcr": True, "packages": ["camelot", "setuptools", "segno"], "optimize": 0, "silent": True, "include_files": ["gs10030w64.exe", "GothamCond-Medium.otf", "belden-logo-superhires.png"], "excludes": ["scipy", "torch"]} | ||||||
|  |  | ||||||
| # base="Win32GUI" should be used only for Windows GUI app | # base="Win32GUI" should be used only for Windows GUI app | ||||||
| base = "console" | base = "console" | ||||||
|   | |||||||
							
								
								
									
										145
									
								
								ur5_control.py
									
									
									
									
									
								
							
							
						
						
									
										145
									
								
								ur5_control.py
									
									
									
									
									
								
							| @@ -14,7 +14,8 @@ from util import fprint | |||||||
|  |  | ||||||
|  |  | ||||||
| rob = None | rob = None | ||||||
|  | offset_x, offset_y, offset_z = (0, 0, 0.14)     # Tool offset | ||||||
|  | limb_base, limb1, limb2, limb3, limb_wrist = (0.105, .425, .39225, .1, .0997)    # Limb lengths | ||||||
|  |  | ||||||
| def init(ip): | def init(ip): | ||||||
|     global rob |     global rob | ||||||
| @@ -190,6 +191,11 @@ def move_to_polar(start_pos, end_pos): | |||||||
|  |  | ||||||
|     return rx_intermediate |     return rx_intermediate | ||||||
|  |  | ||||||
|  | def degtorad(angle): | ||||||
|  |         return angle/180.0 * math.pi | ||||||
|  | def radtodeg(angle): | ||||||
|  |         return angle*180.0 / math.pi | ||||||
|  |  | ||||||
| def move_to_home(): | def move_to_home(): | ||||||
|     global rob |     global rob | ||||||
|  |  | ||||||
| @@ -217,11 +223,13 @@ def normalize_degree(theta): | |||||||
|     return normalized_theta |     return normalized_theta | ||||||
|  |  | ||||||
|  |  | ||||||
| def get_joints_from_xyz_rel(x, y, z, rx=0, ry=-math.pi/2, rz=0, initial_guess = (math.pi/2, math.pi/2, 0)): |  | ||||||
|  | def get_joints_from_xyz_rel(x, y, z, rx=0, ry=-math.pi/2, rz=0, initial_guess = (math.pi/2, math.pi/2, 0), l3offset=0): | ||||||
|     # Get limbs and offsets |     # Get limbs and offsets | ||||||
|     offset_x, offset_y, offset_z = (0, 0, 0.14)     # Tool offset |      | ||||||
|     l_bs, l1, l2, l3, l_wt = (0.1333, .425, .39225, .1267, .0997)    # Limb lengths |  | ||||||
|     #l3=0.15 |     #l3=0.15 | ||||||
|  |     l_bs, l1, l2, l3, l_wt = (limb_base, limb1, limb2, limb3, limb_wrist)    # Limb lengths | ||||||
|  |     l3 += l3offset # add wrist offset, used for gripper angle calculations | ||||||
|      |      | ||||||
|     # Calculate base angle and r relative to shoulder joint |     # Calculate base angle and r relative to shoulder joint | ||||||
|     def calculate_theta(x, y, a): |     def calculate_theta(x, y, a): | ||||||
| @@ -234,23 +242,20 @@ def get_joints_from_xyz_rel(x, y, z, rx=0, ry=-math.pi/2, rz=0, initial_guess = | |||||||
|             # Critical section (x=a, or x=-a). Infinite slope |             # Critical section (x=a, or x=-a). Infinite slope | ||||||
|             # Return 0 or 180 depending on sign |             # Return 0 or 180 depending on sign | ||||||
|             return math.atan2(y, 0) |             return math.atan2(y, 0) | ||||||
|          |  | ||||||
|         # Calculate tangent line y = mx + b |         # Calculate tangent line y = mx + b | ||||||
|         m = (x*y - math.sqrt(x*x*y*y-(x*x-a*a)*(y*y-a*a)))/(x*x-a*a) |         m = (x*y - math.sqrt(x*x*y*y-(x*x-a*a)*(y*y-a*a)))/(x*x-a*a) | ||||||
|         b = flip * a * math.sqrt(1+m*m) |         b = flip * a * math.sqrt(1+m*m) | ||||||
|  |  | ||||||
|         # Calculate equivalent tangent point on circle |         # Calculate equivalent tangent point on circle | ||||||
|         cx = (-flip*m*b)/(1+m*m) |         cx = (-flip*m*b)/(1+m*m) | ||||||
|         cy = m*cx + flip*b |         cy = m*cx + flip*b | ||||||
|  |  | ||||||
|         # Calculate base angle, make angle negative if flip=1 |         # Calculate base angle, make angle negative if flip=1 | ||||||
|         theta = math.atan2(cy, cx) + (-math.pi if flip==1 else 0) |         theta = math.atan2(cy, cx) + (-math.pi if flip==1 else 0) | ||||||
|  |  | ||||||
|         return theta  |         return theta  | ||||||
|      |  | ||||||
|     base_theta = calculate_theta(x, y, l_bs) |     base_theta = calculate_theta(x, y, l_bs) | ||||||
|     cx, cy = l_bs*math.cos(base_theta), l_bs*math.sin(l_bs) |     cx, cy = l_bs*math.cos(base_theta), l_bs*math.sin(base_theta) | ||||||
|     r = math.sqrt((x-cx)**2 + (y-cy)**2)  |     r = math.sqrt((x+offset_x+cx)**2 + (y+offset_y+cy)**2)  | ||||||
|  |  | ||||||
|  |  | ||||||
|     # Formulas to find out joint positions for (r, z) |     # Formulas to find out joint positions for (r, z) | ||||||
| @@ -264,21 +269,60 @@ def get_joints_from_xyz_rel(x, y, z, rx=0, ry=-math.pi/2, rz=0, initial_guess = | |||||||
|  |  | ||||||
|     # Normalize angles |     # Normalize angles | ||||||
|     base, shoulder, elbow, wrist1 = [normalize_degree(deg) for deg in [base_theta, *fsolve(inv_kin_r_z, initial_guess)]] |     base, shoulder, elbow, wrist1 = [normalize_degree(deg) for deg in [base_theta, *fsolve(inv_kin_r_z, initial_guess)]] | ||||||
|  |     wrist1 += rx | ||||||
|     # Return result |     # Return result | ||||||
|     return base, shoulder, elbow, wrist1, ry, rz |     return base, shoulder, elbow, wrist1, ry, rz | ||||||
|  |  | ||||||
| def get_joints_from_xyz_abs(x, y, z, rx=0, ry=-math.pi/2, rz=math.pi/2): | def get_joints_from_xyz_abs(x, y, z, rx=0, ry=-math.pi/2, rz=math.pi/2, l3offset=0): | ||||||
|     joints = get_joints_from_xyz_rel(x, y, z, rx, ry, rz) |     joints = get_joints_from_xyz_rel(x, y, z, rx, ry, rz, l3offset=l3offset) | ||||||
|  |  | ||||||
|     # Joint offsets |     # Joint offsets | ||||||
|     # Base, Shoulder, Elbow, Wrist |     # Base, Shoulder, Elbow, Wrist | ||||||
|     inverse = [1, -1, 1, 1, 1, 1] |     inverse = [1, -1, 1, 1, 1, 1] | ||||||
|     offsets = [-math.pi/2, 0, 0, -math.pi/2, 0, 0] |     offsets = [-math.pi/2, 0, 0, -math.pi/2, 0, 0] | ||||||
|  |     if radtodeg(joints[1]) > 137: | ||||||
|  |         print("CRASH! Shoulder at", joints[1] * 180/math.pi) | ||||||
|  |     #else: | ||||||
|  |         #print("Shoulder at", joints[1] * 180/math.pi) | ||||||
|     # Return adjusted joint positions |     # Return adjusted joint positions | ||||||
|     return [o+j*i for j, o, i in zip(joints, offsets, inverse)] |     return [o+j*i for j, o, i in zip(joints, offsets, inverse)] | ||||||
|  |  | ||||||
|  | # gripper angle: from vertical | ||||||
|  | # gripper length: from joint to start of grip | ||||||
|  | # to flip, you can use flip=True or make gripper angle negative | ||||||
|  | def offset_gripper_angle(x, y, z, gripperangle=35, gripperlength=0.20+0.018, flip=False): | ||||||
|  |     if gripperangle < 0: | ||||||
|  |         rz = - math.pi / 2 | ||||||
|  |     else: | ||||||
|  |         rz = math.pi / 2 | ||||||
|  |  | ||||||
|  |     if flip: | ||||||
|  |         gripperangle = -degtorad(gripperangle) | ||||||
|  |         grippery = gripperlength - math.cos(gripperangle) * gripperlength | ||||||
|  |         grippery += math.sin(gripperangle) * limb3 | ||||||
|  |         gripperx = math.sin(gripperangle) * gripperlength + limb3 * 2 | ||||||
|  |         gripperx -= (1-math.cos(gripperangle)) * limb3 | ||||||
|  |         rz = math.pi / 2 | ||||||
|  |         # flip the whole wrist | ||||||
|  |         return get_joints_from_xyz_abs(x, y, z-grippery, rx=gripperangle + degtorad(180), l3offset=-gripperx, ry=math.pi/2, rz=rz) | ||||||
|  |     else: | ||||||
|  |         gripperangle = degtorad(gripperangle) | ||||||
|  |         grippery = gripperlength - math.cos(gripperangle) * gripperlength | ||||||
|  |         grippery -= math.sin(gripperangle) * limb3 | ||||||
|  |         gripperx = math.sin(gripperangle) * gripperlength | ||||||
|  |         gripperx += (1-math.cos(gripperangle)) * limb3 | ||||||
|  |  | ||||||
|  |         return get_joints_from_xyz_abs(x, y, z-grippery, rx=gripperangle, l3offset=-gripperx, rz=rz) | ||||||
|  |      | ||||||
|  |  | ||||||
|  | def goto_holder_index(idx, z=0.05, gripperangle=35, flip=False): | ||||||
|  |     joint = config["position_map"][idx] | ||||||
|  |     print("Going to cable holder index", joint["index"], "at position", joint["pos"])    | ||||||
|  |     angles = offset_gripper_angle(joint["pos"][1]/1000, joint["pos"][0]/1000, z, gripperangle=gripperangle, flip=flip) | ||||||
|  |     #rob.movej(angles, acc=2, vel=2) | ||||||
|  |     return angles | ||||||
|  |     #angles = get_joints_from_xyz_abs(joint["pos"][1]/1000, joint["pos"][0]/1000, 0.05, ) | ||||||
|  |  | ||||||
| if __name__ == "__main__": | if __name__ == "__main__": | ||||||
|      |      | ||||||
|     #rob.movej((0, 0, 0, 0, 0, 0), 0.1, 0.2) |     #rob.movej((0, 0, 0, 0, 0, 0), 0.1, 0.2) | ||||||
| @@ -321,9 +365,76 @@ if __name__ == "__main__": | |||||||
|  |  | ||||||
|  |  | ||||||
|      |      | ||||||
|     angles = get_joints_from_xyz_abs(-0.7, 0, 0) |     # angles = get_joints_from_xyz_abs(-0.2, 0, 0) | ||||||
|     rob.movej(angles, acc=2, vel=2) |     # rob.movej(angles, acc=2, vel=2) | ||||||
|  |     # angles = get_joints_from_xyz_abs(-0.2, -0.2, 0) | ||||||
|  |     # rob.movej(angles, acc=2, vel=2) | ||||||
|  |     # angles = get_joints_from_xyz_abs(0, -0.6, 0) | ||||||
|  |     # rob.movej(angles, acc=2, vel=2) | ||||||
|  |     # angles = get_joints_from_xyz_abs(0, -0.5, 0) | ||||||
|  |     # rob.movej(angles, acc=2, vel=2) | ||||||
|  |     # angles = get_joints_from_xyz_abs(0, -0.4, 0) | ||||||
|  |     # rob.movej(angles, acc=2, vel=2) | ||||||
|  |     # angles = get_joints_from_xyz_abs(0, -0.3, 0) | ||||||
|  |     # rob.movej(angles, acc=2, vel=2) | ||||||
|  |     # angles = get_joints_from_xyz_abs(0, -0.2, 0) | ||||||
|  |     # rob.movej(angles, acc=2, vel=2) | ||||||
|  |     # angles = get_joints_from_xyz_abs(0, -0.13, 0) | ||||||
|  |     # rob.movej(angles, acc=2, vel=2) | ||||||
|  |     config = None | ||||||
|  |     joints = [] | ||||||
|  |     for i in np.linspace(-0.2, -0.7, 50): | ||||||
|  |          joints.append(get_joints_from_xyz_abs(i, 0, 0)) | ||||||
|  |     #rob.movejs(joints, acc=2, vel=2) | ||||||
|  |     import yaml | ||||||
|  |     with open('config.yml', 'r') as fileread: | ||||||
|  |         #global config | ||||||
|  |         config = yaml.safe_load(fileread) | ||||||
|  |  | ||||||
|  |     #rob.movej(goto_holder_index(24, 0.2, 0), acc=2, vel=2) | ||||||
|  |     #joints = [] | ||||||
|  |      | ||||||
|  |     #for i in np.linspace(0, 340, 340): | ||||||
|  |     #    joints.append(goto_holder_index(24, 0.5, i)) | ||||||
|  |     #rob.movejs(joints, acc=1, vel=3) | ||||||
|  |     angle = 30 | ||||||
|  |     rob.movej(goto_holder_index(26, 0.1, angle), acc=2, vel=2) | ||||||
|  |     time.sleep(1) | ||||||
|  |     rob.movej(goto_holder_index(25, 0.1, angle), acc=2, vel=2) | ||||||
|  |     time.sleep(1) | ||||||
|  |     rob.movej(goto_holder_index(24, 0.1, angle, flip=True), acc=2, vel=2) | ||||||
|  |     #rob.movej(goto_holder_index(32, 0.2, angle), acc=2, vel=2) | ||||||
|  |     #rob.movej(goto_holder_index(38, 0.2, angle), acc=2, vel=2) | ||||||
|  |     #rob.movej(goto_holder_index(25, 0.1, angle, flip=True), acc=2, vel=2) | ||||||
|  |  | ||||||
|  |     #rob.movej(goto_holder_index(25, 0.2, angle, flip=True), acc=2, vel=2) | ||||||
|  |     #rob.movej(goto_holder_index(24, 0.1, angle, flip=True), acc=2, vel=2) | ||||||
|  |     #time.sleep(1) | ||||||
|  |     #rob.movej(goto_holder_index(25, 0.1, angle, flip=True), acc=2, vel=2) | ||||||
|  |     #rob.movej(goto_holder_index(49, 0.1, angle), acc=2, vel=2) | ||||||
|  |     #rob.movej(goto_holder_index(49, 0.1, angle, flip=True), acc=2, vel=2) | ||||||
|  |     # rob.movej(goto_holder_index(50, 0.1, angle, flip=True), acc=2, vel=2) | ||||||
|  |     # rob.movej(goto_holder_index(51, 0.1, angle, flip=True), acc=2, vel=2) | ||||||
|  |     # rob.movej(goto_holder_index(52, 0.1, angle, flip=True), acc=2, vel=2) | ||||||
|  |     # rob.movej(goto_holder_index(53, 0.1, angle, flip=True), acc=2, vel=2) | ||||||
|  |     #time.sleep(2) | ||||||
|  |     #rob.movej(goto_holder_index(24, 0.15, 35, flip=True), acc=2, vel=2) | ||||||
|  |     #time.sleep(10) | ||||||
|  |     # time.sleep(4) | ||||||
|  |     # goto_holder_index(26, 0.1, 20) | ||||||
|  |     # time.sleep(4) | ||||||
|  |     # goto_holder_index(26, 0.1, 30) | ||||||
|  |     # time.sleep(4) | ||||||
|  |     # goto_holder_index(26, 0.1, 40) | ||||||
|  |     # for joint in config["position_map"]: | ||||||
|  |     #joint = config["position_map"][26] | ||||||
|  |     #print("Going to cable holder index", joint["index"], "at position", joint["pos"])    | ||||||
|  |     #angles = get_joints_from_xyz_abs(joint["pos"][1]/1000, joint["pos"][0]/1000, 0.05, )# rx=math.pi / 5) | ||||||
|  |     #joints.append(angles) | ||||||
|  |  | ||||||
|  |     #rob.movej(angles, acc=2, vel=2) | ||||||
|  |     #time.sleep(10) | ||||||
|  |     #rob.movejs(joints, acc=2, vel=2) | ||||||
|     # joints = [] |     # joints = [] | ||||||
|     # for i in np.linspace(-0.3, -0.7, 50): |     # for i in np.linspace(-0.3, -0.7, 50): | ||||||
|     #     joints.append(get_joints_from_xyz_abs(i, 0, 0)) |     #     joints.append(get_joints_from_xyz_abs(i, 0, 0)) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user