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/10/11 22:32]
ryandh
start [2020/03/05 18:25] (current)
russell
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:meeting_20191008|Next Meeting Agenda]] +  * [[botlab:openmeeting_20200128|Next Meeting Agenda]] 
-  * [[BOTlab:|Previous Meetings]]+  * [[botlab:start#​past_meetings|Previous Meetings]]
  
 </​col>​ </​col>​
Line 58: 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]]
 +  * [[equipment:​label_maker|Brother E110 Label Maker]]
 +  * [[equipment:​label_maker_QL_570|Brother QL-570 Label Maker]]
  
 **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:​usb_microscope| USB Microscope]]
  
 **[[equipment:​start|Full Equipment List (Needs Updating!)]]** **[[equipment:​start|Full Equipment List (Needs Updating!)]]**
  • start.1570829544
  • Last modified: 8 months ago
  • by ryandh