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/04/11 11:27]
nick_gover
start [2019/05/30 10:16]
nick_gover
Line 1: Line 1:
 ~~NOTOC~~ ~~NOTOC~~
-====== Bristol Hackspace Wiki ====== 
  
-Welcome to the Bristol Hackspace Wiki, a place to share ideas and information for the Bristol Hackspace community.\\ +<​jumbotron>​ 
-If there'​s information ​you want that isn'​t ​on here, please ​add it to the list of [[requested pages]].+====== ​Welcome ​====== 
 +to the Bristol Hackspace Wiki, a place to share ideas and information for the Bristol Hackspace community. 
 +</​jumbotron>​ 
 + 
 +<callout title="​Call for Editors"​ type="​tip"​ icon="​true">​ The Wiki is in dire need of updating in many places. ​If you consider yourself a subject matter expert ​on any of our equipment ​please ​share your knowledge! See the [[wiki:​syntax|]] page if you get stuck</​callout>​ 
 + 
 +<​grid>​ 
 +<col sm="​4">​ 
 +===== Hackspace Manual ===== 
 + 
 +** [[botlab:​policies:​start| Terms & Conditions]] ** 
 + 
 +**Hackspace Rules** 
 +  * [[botlab:​policies:​hackspace_rules| Hackspace Rules]]
  
-<box left 30% red| **Hackspace Manual** > 
-**About Hackspace** 
-  * [[rules:​hackspace_rules | Hackspace Rules]] ​ 
 **Guides** **Guides**
-  * [[guides:​safe_working | Safe Working]] +  * [[botlab:​policies:​safe_working| Safe Working ​Guide]] 
-  * [[guides:membership | Membership ​of Hackspace]] +  * [[botlab:​policies:​membership| Membership ​Guide]] 
-  * [[guides:fair_use | Fair Use of Hackspace]] +  * [[botlab:​policies:fair_use| Fair Use Guide]] 
-  * [[guides:​guests_and_children | Guests ​and Children]] +  * [[botlab:​policies:​guests_and_children| Guests ​Children ​Guide]] 
-  * [[guides:​stuff_storage_stickers | Stuff, Storage, & Stickers]] +  * [[botlab:​policies:​stuff_storage_stickers| Stuff, Storage, & Stickers ​Guide]] 
-  * [[rules:bv_studios_rules ​| BV Studios ​Building ​Guide]] +  * [[botlab:policies:​inductions|Inductions Guide]] 
-**Policies** +  * [[botlab:​policies:​bv_studios_guide| BV Studios Guide]] 
-  * [[policies:​conduct|Conduct Policy]]  + 
-  * [[policies:​complaints|Complaints Policy]] +**BOTLab ​Policies** 
-  * [[policies:​health_and_safety|Health ​and Safety Policy]] +  * [[botlab:policies:​conduct|Conduct Policy]]  
-  * [[Policy on children in the hackspace|Policy on children in the hackspace]]+  * [[botlab:policies:​complaints|Complaints Policy]] 
 +  * [[botlab:policies:​health_and_safety|Health ​Safety Policy]] 
 + 
 +**About Hackspace** 
 +  * [[BOTlab:|Bristol Open Technology Lab C.I.C.]] 
 +  * [[botlab:​insurance|Insurance Information]] 
 + 
 +</​col>​ 
 + 
 +<col sm="​4">​ 
 +===== Tools & Equipment ===== 
 +**Induction Protected Machinery** 
 +  * [[equipment:​a0_laser_cutter:​start | A0 Laser Cutter]] 
 +  * [[equipment:​prusamk3| Original Prusa MK3S 3D Printer]] 
 +  * [[equipment:​woodturning_lathe| Woodturning lathe]] 
 +  * [[equipment:​metalturning_lathe| Metalturning lathe]] 
 +  * [[equipment:​bandsaw| Record Power BS300E Bandsaw]] 
 +  * [[equipment:​CNC Mill| ICP 4030 CNC Mill]] 
 + 
 +**Workshop Equipment** 
 +  * [[equipment:​floor-standing-pillar-drill|Floor Standing Pillar Drill]] 
 +  * [[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:​thermal_camera|FLIR Thermal Imaging Camera]] 
 + 
 +**Electronics Equipment** 
 +  * [[equipment:​soldering-irons| Soldering Irons]] 
 +  * [[equipment:​psus| Power Supplies]] 
 +  * [[equipment:​oscilloscopes| Oscilloscopes]] 
 +  * [[equipment:​sig-gens| Signal Generators]]
  
-</​box>​+**[[equipment:​start|Full Equipment List (Needs Updating!)]]**
  
-<box left 30% green|**Equipment and Components**>​ +**[[botlab:​hsproposals:​startPurchase Proposals]]**
-  ​* [[Our tools and facilities ​|Equipment in the space]] +
-Most hand tools are available for use by members without induction. However, some REQUIRE INDUCTION before use. +
-  ​[[a0_laser_cutter|A0 laser cutter (INDUCTION REQUIRED)]] +
-  ​[[PrusaMK3 | New 3D Printer ​ (INDUCTION REQUIRED)]] +
-  * [[Woodturning lathe|Woodturning lathe (INDUCTION REQUIRED)]] +
-  * [[Metalturning lathe|Metalturning lathe (INDUCTION REQUIRED)]] +
-  * [[Bandsaw|Bandsaw (INDUCTION REQUIRED)]] +
-  * [[Floor-Standing-Pillar-drill|Floor Standing ​ Pillar Drill]] +
-  * [[thermal_camera|FLIR Digital Thermal Imaging Camera]] +
-**Other equipment pages** +
-  * [[Consumables]] +
-  * [[Components]] +
-  * [[equipment wanted | Equipment we would like to buy]] +
-  * [[Corporate memberships | Scrapstore membership]] +
-</​box>​+
  
-<box left 30% blue|**Hacker'​s Resources**>​ 
-  * [[Skillshares]] 
-  * [[Bristol-Biohack|Bristol Biohack]] 
-  * [[https://​github.com/​bristolhackspace | Check out our GitHub Repository]] 
-  * Member'​s [[projects]] - add your project here! 
-  * [[network outage logbook | Network Outage Logbook]] 
-  * [[Code Snippets]] 
-  * [[Links and Resources]] 
-  * [[PCB|PCB & SMT resources]] 
-  * [[openscad resources]] 
-</​box>​ 
  
-<box left blue|**Other Important Stuff**>​ +</col>
-  * [[BOTlab:​|Bristol Open Technology Lab C.I.C.]] (The Hackspace legal entity) Administration/Minutes/​Constitution/​Expenses etc. +
-  * [[hs_proposals | Review/​Submit a purchasing proposal]] +
-  * [[Insurance Policy information]] +
-</box>+
  
-===== Editing ​=====+<col sm="​4">​ 
 +===== Resources ​====
 +**Parts & Materials** 
 +  * [[resources:​sources_of_materials_and_services]] 
 +  * [[resources:​consumables]] 
 +  * [[resources:​corporate_memberships|Corporate Memberships]]
  
-For this wiki we use DokuWiki a freely available, standards compliant and easy to use [[http://​en.wikipedia.org/​wiki/​Wiki|wiki]].\\ +**Electronics** 
-If you would like to know more about DokuWiki then you can visit the home page at: http://​www.dokuwiki.org/​dokuwiki or read the manual at: http://​www.dokuwiki.org/​manual+  * [[resources:components]] 
 +  * [[resources:pcb|PCB & SMT Resources]]
  
-Wiki pages are written using a simple markup language. This allows you to add formatting such as **bold**, //italic// and __underline__ and more. For more on this markup language see http://www.dokuwiki.org/syntax and [[How to create tables]]. If you would like to contribute to the wiki to add your own pages or anything else you consider useful to the Hackspace community then click the //login// link above. This will take you to another page from where you can register.+**Programming** 
 +  * [[https://github.com/bristolhackspace | GitHub Repo]] 
 +  * [[resources:​code_snippets]]
  
-===== Deprecated =====+**Design / CAD** 
 +  * [[resources:​openscad_resources| OpenSCAD]] 
 +  * [[equipment:​a0_laser_cutter:​software|Laser Cutter CAD Software]]
  
-**New Users** +**Biohack** 
-  * [[New People Read This | Hackspace principles]]  +  * [[resources:bristol-biohack|Bristol Biohack]]
-  * [[committee | Hackspace committee]] +
-  * [[http://​www.bristolhackspace.org.uk/​user/​register/​ | Become a member]] +
-  * [[hackspace_manual/​ | Read the hackspace manual]] +
-  * [[https://​lists.aktivix.org/​mailman/​listinfo/​hackspacebristol | Join the general mailing list - not used much anymore. ]] +
-  * [[https://​lists.aktivix.org/​pipermail/​hackspacebristol/​ | Read the Archived emails]] +
-  * [[https://​groups.google.com/​forum/#​!forum/​bristolhackspace| Join the Members Only Google Group & email list]] +
-  * [[How to get into the physical hackspace]] +
-**Using the Hackspace** +
-  * [[Bins and Recycling]] It's up to members to keep the space clean and tidy! +
-  * [[Routine-Jobs|Routine Tasks]] regular maintenance work necessary to keep the space working efficiently +
-  * [[Non-Routine-Jobs|Non Routine Jobs]] Things that are faulty and need fixing +
-  * [[Health-and-Safety|Health and Safety]]  +
-  * [[Signs|Signage]] to signify status of items in the hackspace +
-  * [[bvstudios|BV Studios Agreement]] We need to follow these rules as part of our licence to occupy the space in BV Studios +
-  * [[visitors | Notes for showing visitors around the Hackspace]] +
-**Get involved** +
-  * [[members_meet | Attend Members'​ Meeting]] +
-  * [[#Editing | Update the wiki]] +
-  * [[web_services | Websites and Services ]] +
-   +
-**News** +
-  * [[Publicity]] +
-  * [[http://bristol.hackspace.org.uk/​blog/​ | Read the blog]] +
-  * [[http://​twitter.com/​bristolhackspc | Follow us on Twitter]] +
-  * [[http://​bristol.hackspace.org.uk/​anyonein/​|Anyone in script]] ​see explanation [[how_to_get_into_the_physical_hackspace|here]]+
  
-**Buying equipment for the hackspace** +</​col>​ 
-  * [[BOTlab:​Expenses claims | Buying items for the Hackspace]]+</​grid>​
  
-**Processes** 
-  * [[Cyanotype]] 
  
  
  • start
  • Last modified: 7 weeks ago
  • by nick_gover