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/30 10:16]
nick_gover
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 34: Line 34:
   * [[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 46: 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 55: 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 90: Line 95:
 **Biohack** **Biohack**
   * [[resources:​bristol-biohack|Bristol Biohack]]   * [[resources:​bristol-biohack|Bristol Biohack]]
 +
 +**Toys**
 +  * [[toys:​hoverboard|Hoverboard]]
 +
  
 </​col>​ </​col>​
  • start.1559207804
  • Last modified: 8 months ago
  • by nick_gover