Merge branch 'master' of https://github.com/BrailleRapSP/BrailleRapSP

2025-06-08 09:59:58 +02:00 · 2018-04-24 16:28:24 +02:00 · 2018-04-24 16:28:24 +02:00 · ae4227df93
commit ae4227df93
parent 60628f71ec 98d413a2cb
51 changed files with 25 additions and 12 deletions
--- a/LICENCE.rst
+++ b/LICENCE.rst
--- a/docs/IMG/3sides_box_2018_03_18_2918.JPG
+++ b/docs/IMG/3sides_box_2018_03_18_2918.JPG
--- a/docs/IMG/4sides_box2018_03_18_2919.JPG
+++ b/docs/IMG/4sides_box2018_03_18_2919.JPG
--- a/docs/IMG/BrailleRAP
+++ b/docs/IMG/BrailleRAP
--- a/docs/IMG/BrailleRAP
+++ b/docs/IMG/BrailleRAP
--- a/docs/IMG/BrailleRAP-V5.01.jpg
+++ b/docs/IMG/BrailleRAP-V5.01.jpg
--- a/docs/IMG/BrailleRAP-V5.02.jpg
+++ b/docs/IMG/BrailleRAP-V5.02.jpg
--- a/docs/IMG/Left-Mount-00-2018_03_21_2957-2017-01-27.JPG
+++ b/docs/IMG/Left-Mount-00-2018_03_21_2957-2017-01-27.JPG
--- a/docs/IMG/Left-Mount-01-2018_03_21_2958-2017-01-27.JPG
+++ b/docs/IMG/Left-Mount-01-2018_03_21_2958-2017-01-27.JPG
--- a/docs/IMG/Left-Mount-02-2018_03_21_2959-2017-01-27.JPG
+++ b/docs/IMG/Left-Mount-02-2018_03_21_2959-2017-01-27.JPG
--- a/docs/IMG/Left-Mount-03-2018_03_21_2960-2017-01-27.JPG
+++ b/docs/IMG/Left-Mount-03-2018_03_21_2960-2017-01-27.JPG
--- a/docs/IMG/Left-Mount-04-2018_03_21_2961-2017-01-27.JPG
+++ b/docs/IMG/Left-Mount-04-2018_03_21_2961-2017-01-27.JPG
--- a/docs/IMG/Left-Mount-05-2018_03_21_2962-2017-01-27.JPG
+++ b/docs/IMG/Left-Mount-05-2018_03_21_2962-2017-01-27.JPG
--- a/docs/IMG/Left-Mount-06-2018_03_21_2963-2017-01-27.JPG
+++ b/docs/IMG/Left-Mount-06-2018_03_21_2963-2017-01-27.JPG
--- a/docs/IMG/Left-Mount-07-2018_03_21_2964-2017-01-27.JPG
+++ b/docs/IMG/Left-Mount-07-2018_03_21_2964-2017-01-27.JPG
--- a/docs/IMG/Left-Mount-08-2018_03_21_2965-2017-01-27.JPG
+++ b/docs/IMG/Left-Mount-08-2018_03_21_2965-2017-01-27.JPG
--- a/docs/IMG/Left-Mount-09-2018_03_21_2966-2017-01-27.JPG
+++ b/docs/IMG/Left-Mount-09-2018_03_21_2966-2017-01-27.JPG
--- a/docs/IMG/Left-Mount-10-2018_03_21_2967-2017-01-27.JPG
+++ b/docs/IMG/Left-Mount-10-2018_03_21_2967-2017-01-27.JPG
--- a/docs/IMG/Left-Mount-11-2018_03_21_2968-2017-01-27.JPG
+++ b/docs/IMG/Left-Mount-11-2018_03_21_2968-2017-01-27.JPG
--- a/docs/IMG/Left-Mount-12-2018_03_21_2969-2017-01-27.JPG
+++ b/docs/IMG/Left-Mount-12-2018_03_21_2969-2017-01-27.JPG
--- a/docs/IMG/Left-Mount-13-2018_03_21_2970-2017-01-27.JPG
+++ b/docs/IMG/Left-Mount-13-2018_03_21_2970-2017-01-27.JPG
--- a/docs/IMG/Left-Mount-14-2018_03_21_2971-2017-01-27.JPG
+++ b/docs/IMG/Left-Mount-14-2018_03_21_2971-2017-01-27.JPG
--- a/docs/IMG/bluetape_box12018_03_18_2938.JPG
+++ b/docs/IMG/bluetape_box12018_03_18_2938.JPG
--- a/docs/IMG/bluetape_box22018_03_18_2939.JPG
+++ b/docs/IMG/bluetape_box22018_03_18_2939.JPG
--- a/docs/IMG/bluetape_box32018_03_18_2940.JPG
+++ b/docs/IMG/bluetape_box32018_03_18_2940.JPG
--- a/docs/IMG/braille.jpg
+++ b/docs/IMG/braille.jpg
--- a/docs/IMG/braillerapV3_001.png
+++ b/docs/IMG/braillerapV3_001.png
--- a/docs/IMG/cyano_roll_2018_03_18_2934.JPG
+++ b/docs/IMG/cyano_roll_2018_03_18_2934.JPG
--- a/docs/IMG/electromagnet.png
+++ b/docs/IMG/electromagnet.png
--- a/docs/IMG/epoxy_glue_roll2018_03_18_2936.JPG
+++ b/docs/IMG/epoxy_glue_roll2018_03_18_2936.JPG
--- a/docs/IMG/flat_lasercut2018_03_18_2917.JPG
+++ b/docs/IMG/flat_lasercut2018_03_18_2917.JPG
--- a/docs/IMG/flyback.png
+++ b/docs/IMG/flyback.png
--- a/docs/IMG/flyback_schema.png
+++ b/docs/IMG/flyback_schema.png
--- a/docs/IMG/oring_roll2018_03_18_2930.JPG
+++ b/docs/IMG/oring_roll2018_03_18_2930.JPG
--- a/docs/IMG/right-axes-mount-Coupler2018_03_21_2974-2017-01-27.JPG
+++ b/docs/IMG/right-axes-mount-Coupler2018_03_21_2974-2017-01-27.JPG
--- a/docs/IMG/right-axes-mount-Global2018_03_21_2955-2017-01-27.JPG
+++ b/docs/IMG/right-axes-mount-Global2018_03_21_2955-2017-01-27.JPG
--- a/docs/IMG/right-axes-mount-kp08-2018_03_21_2975-2017-01-27.JPG
+++ b/docs/IMG/right-axes-mount-kp08-2018_03_21_2975-2017-01-27.JPG
--- a/docs/IMG/right-axes-mount-right-install2018_03_21_2980-2017-01-27.JPG
+++ b/docs/IMG/right-axes-mount-right-install2018_03_21_2980-2017-01-27.JPG
--- a/docs/IMG/right-axes-mount2018_03_21_2952-2017-01-27.JPG
+++ b/docs/IMG/right-axes-mount2018_03_21_2952-2017-01-27.JPG
--- a/docs/IMG/right-axes-mountM32018_03_21_2953-2017-01-27.JPG
+++ b/docs/IMG/right-axes-mountM32018_03_21_2953-2017-01-27.JPG
--- a/docs/IMG/rouleauv3.png
+++ b/docs/IMG/rouleauv3.png
--- a/docs/IMG/rubber_band_roll2018_03_18_2937.JPG
+++ b/docs/IMG/rubber_band_roll2018_03_18_2937.JPG
--- a/docs/IMG/sand_roll_2018_03_18_2932.JPG
+++ b/docs/IMG/sand_roll_2018_03_18_2932.JPG
--- a/docs/IMG/sanding_box2018_03_21_2946-2017-01-27.JPG
+++ b/docs/IMG/sanding_box2018_03_21_2946-2017-01-27.JPG
--- a/docs/IMG/snapshot00.png
+++ b/docs/IMG/snapshot00.png
--- a/docs/IMG/tap_bottom_roll2018_03_18_2927.JPG
+++ b/docs/IMG/tap_bottom_roll2018_03_18_2927.JPG
--- a/docs/IMG/tap_upper_rol_2018_03_18_2929.JPG
+++ b/docs/IMG/tap_upper_rol_2018_03_18_2929.JPG
--- a/docs/assemblage.rst
+++ b/docs/assemblage.rst
@ -6,13 +6,25 @@ Collage de la caisse bois

 Matériel:

-* 5 parties en contre plaqué de 5mm découpées au laser.
+* FACE (contre-plaqué de 5mm découpée au laser).
+* BACK (contre-plaqué de 5mm découpée au laser).
+* BOTTOM (contre-plaqué de 5mm découpée au laser).
+* LEFT_SIDE (contre-plaqué de 5mm découpée au laser).
+* RIGHT_SIDE (contre-plaqué de 5mm découpée au laser).
 * Colle à bois.
 * Scotch de peintre.

-#. Préparer le 5 éléments en CP de 5mm : Façade, Arrière, côté gauche, côté droit et fond.
+#. Préparer le 5 éléments : FACE, BACK, LEFT_SIDE, RIGHT_SIDE et BOTTOM .
+
+  ..image :: ./IMG/BrailleRAP-V5.02.jpg
+       :align: center
+
 #. Encoller les encoches, assembler les 5 parties et les maintenir en place avec du scotch de peintre le temps du séchage.

+  ..image :: ./IMG/BrailleRAP-V5.01.jpg
+       :align: center
+
+
 Préparation du pointeau femelle
 --------------------------------

--- a/docs/index.rst
+++ b/docs/index.rst
@ -20,12 +20,12 @@ Contents:
   :maxdepth: 2

   history
-   license
+   licence
   bom
   flybackboard
   assemblage
   marlin

-.. index:: history, license, bom, marlin, assembling, flybackboard
+.. index:: history, licence, bom, marlin, assemblage, flybackboard


--- a/docs/licence.rst
+++ b/docs/licence.rst
@ -0,0 +1,9 @@
+Licence
+=======
+
+Tous les travaux originaux de BrailleRapSP sont sous la license CERN Open Hardware Licence v1.2 (https://www.ohwr.org/projects/cernohl/wiki), traduite en français sur cette page:http://fr-voosilla.ouvaton.org/CERN-OHL-%5Bfr%5D-Traduction-Fran%C3%A7aise.html
+
+Nous utilisons plusieurs projets open source, qui ont leur propre licence :
+
+   #. Le projet "Marlin firmware"  pour le firmware de la carte: https://github.com/MarlinFirmware/Marlin 
+   #. BrailleRap qui a un générateur de gcode  https://github.com/arthursw/BrailleRap
--- a/docs/license.rst
+++ b/docs/license.rst
@ -1,8 +0,0 @@
-License
-=======
-
-All original work for BrailleRapSP are licensed under CERN Open Hardware Licence v1.2 https://www.ohwr.org/projects/cernohl/wiki
-
-We use several existing open-source projets, those projects are licensed under their original license :
-   #. Marlin firmware  has ramps firmware https://github.com/MarlinFirmware/Marlin 
-   #. BrailleRap has gcode generator https://github.com/arthursw/BrailleRap