Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
start [2019/05/04 17:41]
felix.h
start [2020/08/22 11:36] (current)
nick_gover
Line 3: Line 3:
 <​jumbotron>​ <​jumbotron>​
 ====== Welcome ====== ====== Welcome ======
-to the Bristol Hackspace Wiki, a place to share ideas and information for the Bristol Hackspace community.+Welcome ​to the Bristol Hackspace Wiki, a place to share ideas and information for the Bristol Hackspace community ​and beyond.
 </​jumbotron>​ </​jumbotron>​
  
Line 11: Line 11:
 <col sm="​4">​ <col sm="​4">​
 ===== Hackspace Manual ===== ===== Hackspace Manual =====
-**About Hackspace** + 
-  [[BOTlab:​|Bristol Open Technology Lab C.I.C.]] +** [[botlab:policies:​startTerms & Conditions]] **
-  ​* [[botlab:insurance|Insurance Information]]+
  
 **Hackspace Rules** **Hackspace Rules**
-  * [[botlab:​policies:​hackspace_rules| Hackspace Rules]]+  * [[botlab:​policies:​hackspace_rules | Hackspace Rules]]
  
 **Guides** **Guides**
-  * [[botlab:​policies:​membershipMembership ​Guide]] +  * [[botlab:​policies:​safe_working ​Safe Working ​Guide]] 
-  * [[botlab:​policies:​fair_useFair Use Guide]] +  * [[botlab:​policies:​membership ​Membership ​Guide]] 
-  * [[botlab:​policies:​safe_workingSafe Working ​Guide]] +  * [[botlab:​policies:​fair_use ​Fair Use Guide]] 
-  * [[botlab:​policies:​guests_and_children| Guests ​and Children Guide]] +  * [[botlab:​policies:​guests_and_children | Guests ​Children Guide]] 
-  * [[botlab:​policies:​stuff_storage_stickers| Stuff, Storage, & Stickers Guide]] +  * [[botlab:​policies:​stuff_storage_stickers | Stuff, Storage, & Stickers ​Guide]] 
-  * [[botlab:​policies:​bv_studios_guide| BV Studios Guide]]+  * [[botlab:​policies:​inductions |Inductions ​Guide]] 
 +  * [[botlab:​policies:​bv_studios_guide | BV Studios Guide]]
  
 **BOTLab Policies** **BOTLab Policies**
-  * [[botlab:​policies:​conduct|Conduct Policy]]  +  * [[botlab:​policies:​conduct | Conduct Policy]]  
-  * [[botlab:​policies:​complaints|Complaints Policy]] +  * [[botlab:​policies:​complaints | Complaints Policy]] 
-  * [[botlab:​policies:​health_and_safety|Health ​and Safety Policy]]+  * [[botlab:​policies:​health_and_safety | Health ​Safety Policy]] 
 + 
 +**About Hackspace** 
 +  * [[BOTlab: | Bristol Open Technology Lab C.I.C.]] 
 +  * [[botlab:​insurance | Insurance Information]] 
 +  * [[botlab:​agm_20200903 | Next Meeting Agenda]] 
 +  * [[botlab:​start#​past_meetings | Previous Meetings]]
  
 </​col>​ </​col>​
Line 39: Line 45:
   * [[equipment:​prusamk3| Original Prusa MK3S 3D Printer]]   * [[equipment:​prusamk3| Original Prusa MK3S 3D Printer]]
   * [[equipment:​woodturning_lathe| Woodturning lathe]]   * [[equipment:​woodturning_lathe| Woodturning lathe]]
-  * [[Metalturning lathe | Metalturning lathe]] +  * [[equipment:​metalturning_lathe| Metalturning lathe]] 
-  * [[equipment:​bandsaw| Bandsaw]]+  * [[equipment:​bandsaw| ​Record Power BS300E ​Bandsaw]] 
 +  * [[equipment:​CNC Mill| ICP 4030 CNC Mill]] 
 +  * [[equipment:​inducted_Users_DB| Inducted Users Database]]
  
-**Other Tools & Equipment**+**Workshop ​Equipment**
   * [[equipment:​floor-standing-pillar-drill|Floor Standing Pillar Drill]]   * [[equipment:​floor-standing-pillar-drill|Floor Standing Pillar Drill]]
-  * [[maykuformbox|Mayku Formbox Vacuum Former]]+  * [[equipment:​floor-standing-belt-disc-sander|Clarke CS6-9C Floor Standing Belt/Disc Sander]] 
 + 
 +**Specialist Tools** 
 +  * [[equipment:​maykuformbox|Mayku Formbox Vacuum Former]]
   * [[equipment:​mpx-90_engraver|Roland MPX-90 Engraver]]   * [[equipment:​mpx-90_engraver|Roland MPX-90 Engraver]]
-  * [[equipment:​roland-dpx-3300|Roland DPX-3300 Pen Plotter]] 
   * [[equipment:​thermal_camera|FLIR Thermal Imaging Camera]]   * [[equipment:​thermal_camera|FLIR Thermal Imaging Camera]]
 +  * [[equipment:​sublimation_printer|Sublimation Printer and Heat Press]]
 +  * [[equipment:​label_maker|Brother E110 Label Maker]]
 +  * [[equipment:​label_maker_QL_570|Brother QL-570 Label Maker]]
 +
 +**Electronics Equipment**
 +  * [[equipment:​soldering-irons| Soldering Irons]]
 +  * [[equipment:​psus| Power Supplies]]
 +  * [[equipment:​oscilloscopes| Oscilloscopes]] and [[equipment:​oscilloscopeprobes| Probes]]
 +  * [[equipment:​sig-gens| Signal Generators]]
 +  * [[equipment:​spotwelder| Spot Welder]]
 +  * [[equipment:​usb_microscope| USB Microscope]]
  
 **[[equipment:​start|Full Equipment List (Needs Updating!)]]** **[[equipment:​start|Full Equipment List (Needs Updating!)]]**
  
-**Acquiring Tools & Equipment** +**[[botlab:​hsproposals:​start| Purchase Proposals]]**
-  ​* [[botlab:​hsproposals:​start| Purchase Proposals]] +
-  ​[[equipment wanted | Wishlist]]+
  
  
Line 61: Line 80:
 ===== Resources ===== ===== Resources =====
 **Parts & Materials** **Parts & Materials**
-  * [[Sources of Materials And Services]] +  * [[resources:​sources_of_materials_and_services]] 
-  * [[Consumables]] +  * [[resources:​consumables]] 
-  * [[corporate_memberships|Corporate Memberships]]+  * [[resources:corporate_memberships|Corporate Memberships]]
  
 **Electronics** **Electronics**
-  * [[Components]] +  * [[resources:​components]] 
-  * [[PCB|PCB & SMT Resources]]+  * [[resources:​pcb|PCB & SMT Resources]]
  
 **Programming** **Programming**
   * [[https://​github.com/​bristolhackspace | GitHub Repo]]   * [[https://​github.com/​bristolhackspace | GitHub Repo]]
-  * [[Code Snippets]]+  * [[resources:​code_snippets]]
  
 **Design / CAD** **Design / CAD**
-  * [[openscad ​resources| OpenSCAD]]+  * [[resources:​openscad_resources| OpenSCAD]]
   * [[equipment:​a0_laser_cutter:​software|Laser Cutter CAD Software]]   * [[equipment:​a0_laser_cutter:​software|Laser Cutter CAD Software]]
  
 **Biohack** **Biohack**
-  * [[Bristol-Biohack|Bristol Biohack]]+  * [[resources:​bristol-biohack|Bristol Biohack]] 
 + 
 +**Toys** 
 +  * [[toys:​hoverboard|Hoverboard]] 
  
 </​col>​ </​col>​
  • start.1556988112
  • Last modified: 17 months ago
  • by felix.h