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/02 20:44]
felix.h call for editors
start [2020/01/13 18:21] (current)
felix.h
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:guides:membershipMembership of Hackspace]] +  * [[botlab:policies:safe_workingSafe Working Guide]] 
-  * [[botlab:guides:fair_useFair Use of Hackspace]] +  * [[botlab:policies:membershipMembership Guide]] 
-  * [[botlab:guides:safe_workingSafe Working]] +  * [[botlab:policies:fair_useFair Use Guide]] 
-  * [[botlab:guides:​guests_and_children| Guests ​and Children]] +  * [[botlab:policies:​guests_and_children| Guests ​Children ​Guide]] 
-  * [[botlab:guides:​stuff_storage_stickers| Stuff, Storage, & Stickers]]+  * [[botlab:policies:​stuff_storage_stickers| Stuff, Storage, & Stickers ​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]]
  
-  ​* [[botlab:policies:bv_studios_rulesBV Studios Rules]]+**About Hackspace** 
 +  * [[BOTlab:​|Bristol Open Technology Lab C.I.C.]] 
 +  ​* [[botlab:insurance|Insurance Information]] 
 +  * [[botlab:​openmeeting_20200128|Next Meeting Agenda]] 
 +  * [[botlab:start#​past_meetings|Previous Meetings]]
  
 </​col>​ </​col>​
 +
 <col sm="​4">​ <col sm="​4">​
 ===== Tools & Equipment ===== ===== Tools & Equipment =====
 **Induction Protected Machinery** **Induction Protected Machinery**
-  * [[a0_laser_cutter:​start | A0 Laser Cutter]] +  * [[equipment:a0_laser_cutter:​start | A0 Laser Cutter]] 
-  * [[PrusaMK3 ​| Original Prusa MK3S 3D Printer]] +  * [[equipment:​prusamk3| Original Prusa MK3S 3D Printer]] 
-  * [[Woodturning lathe | Woodturning lathe]] +  * [[equipment:​woodturning_lathe| Woodturning lathe]] 
-  * [[Metalturning lathe | Metalturning lathe]] +  * [[equipment:​metalturning_lathe| Metalturning lathe]] 
-  * [[Bandsaw ​| Bandsaw]]+  * [[equipment:​bandsawRecord Power BS300E ​Bandsaw]] 
 +  * [[equipment:​CNC Mill| ICP 4030 CNC Mill]] 
 +  * [[equipment:​inducted_Users_DB| Inducted Users Database]]
  
-**Other Tools & Equipment** +**Workshop ​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]]
-  * [[mpx-90_engraver|Roland MPX-90 Engraver]] +
-  * [[roland-dpx-3300|Roland DPX-3300 Pen Plotter]] +
-  * [[thermal_camera|FLIR Thermal Imaging Camera]]+
  
-**[[Our tools and facilities ​|Full Equipment List (Needs Updating!)]]**+**Specialist Tools** 
 +  ​* [[equipment:​maykuformbox|Mayku Formbox Vacuum Former]] 
 +  * [[equipment:​mpx-90_engraver|Roland MPX-90 Engraver]] 
 +  * [[equipment:​thermal_camera|FLIR Thermal Imaging Camera]] 
 +  * [[equipment:​sublimation_printer|Sublimation Printer ​and Heat Press]] 
 + 
 +**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:​start|Full Equipment List (Needs Updating!)]]** 
 + 
 +**[[botlab:​hsproposals:​start| Purchase Proposals]]**
  
-**Acquiring Tools & Equipment** 
-  * [[equipment wanted | Wishlist]] 
-  * [[hs_proposals | Purchase Proposals]] 
  
 </​col>​ </​col>​
 +
 <col sm="​4">​ <col sm="​4">​
 ===== 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]] 
-  * [[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.1556826242
  • Last modified: 9 months ago
  • by felix.h