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/12 23:29]
felix.h add equipment
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 =====
 +
 +** [[botlab:​policies:​start| Terms & Conditions]] **
 +
 **Hackspace Rules** **Hackspace Rules**
   * [[botlab:​policies:​hackspace_rules| Hackspace Rules]]   * [[botlab:​policies:​hackspace_rules| Hackspace Rules]]
  
 **Guides** **Guides**
 +  * [[botlab:​policies:​safe_working| Safe Working Guide]]
   * [[botlab:​policies:​membership| Membership Guide]]   * [[botlab:​policies:​membership| Membership Guide]]
   * [[botlab:​policies:​fair_use| Fair Use Guide]]   * [[botlab:​policies:​fair_use| Fair Use Guide]]
-  ​* [[botlab:​policies:​safe_working| Safe Working Guide]] +  * [[botlab:​policies:​guests_and_children| Guests ​Children Guide]]
-  ​* [[botlab:​policies:​guests_and_children| Guests ​and Children Guide]]+
   * [[botlab:​policies:​stuff_storage_stickers| Stuff, Storage, & Stickers Guide]]   * [[botlab:​policies:​stuff_storage_stickers| Stuff, Storage, & Stickers Guide]]
 +  * [[botlab:​policies:​inductions|Inductions Guide]]
   * [[botlab:​policies:​bv_studios_guide| BV Studios Guide]]   * [[botlab:​policies:​bv_studios_guide| BV Studios Guide]]
  
Line 25: Line 29:
   * [[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** **About Hackspace**
   * [[BOTlab:​|Bristol Open Technology Lab C.I.C.]]   * [[BOTlab:​|Bristol Open Technology Lab C.I.C.]]
   * [[botlab:​insurance|Insurance Information]]   * [[botlab:​insurance|Insurance Information]]
 +  * [[botlab:​openmeeting_20200128|Next Meeting Agenda]]
 +  * [[botlab:​start#​past_meetings|Previous Meetings]]
  
 </​col>​ </​col>​
Line 42: Line 48:
   * [[equipment:​bandsaw| Record Power BS300E Bandsaw]]   * [[equipment:​bandsaw| Record Power BS300E Bandsaw]]
   * [[equipment:​CNC Mill| ICP 4030 CNC Mill]]   * [[equipment:​CNC Mill| ICP 4030 CNC Mill]]
 +  * [[equipment:​inducted_Users_DB| Inducted Users Database]]
  
 **Workshop Equipment** **Workshop Equipment**
Line 51: Line 58:
   * [[equipment:​mpx-90_engraver|Roland MPX-90 Engraver]]   * [[equipment:​mpx-90_engraver|Roland MPX-90 Engraver]]
   * [[equipment:​thermal_camera|FLIR Thermal Imaging Camera]]   * [[equipment:​thermal_camera|FLIR Thermal Imaging Camera]]
 +  * [[equipment:​sublimation_printer|Sublimation Printer and Heat Press]]
  
 **Electronics Equipment** **Electronics Equipment**
   * [[equipment:​soldering-irons| Soldering Irons]]   * [[equipment:​soldering-irons| Soldering Irons]]
   * [[equipment:​psus| Power Supplies]]   * [[equipment:​psus| Power Supplies]]
-  * [[equipment:​oscilloscopes| Oscilloscopes]]+  * [[equipment:​oscilloscopes| Oscilloscopes]] and [[equipment:​oscilloscopeprobes| Probes]]
   * [[equipment:​sig-gens| Signal Generators]]   * [[equipment:​sig-gens| Signal Generators]]
 +  * [[equipment:​spotwelder| Spot Welder]]
  
 **[[equipment:​start|Full Equipment List (Needs Updating!)]]** **[[equipment:​start|Full Equipment List (Needs Updating!)]]**
Line 86: Line 95:
 **Biohack** **Biohack**
   * [[resources:​bristol-biohack|Bristol Biohack]]   * [[resources:​bristol-biohack|Bristol Biohack]]
 +
 +**Toys**
 +  * [[toys:​hoverboard|Hoverboard]]
 +
  
 </​col>​ </​col>​
  • start.1557700182
  • Last modified: 9 months ago
  • by felix.h