diff --git a/docs/_build/gettext/.doctrees/assemblage.doctree b/docs/_build/gettext/.doctrees/assemblage.doctree index 7c0a6ca..06eeee5 100644 Binary files a/docs/_build/gettext/.doctrees/assemblage.doctree and b/docs/_build/gettext/.doctrees/assemblage.doctree differ diff --git a/docs/_build/gettext/.doctrees/bom.doctree b/docs/_build/gettext/.doctrees/bom.doctree index f1eb18a..0e6a1bd 100644 Binary files a/docs/_build/gettext/.doctrees/bom.doctree and b/docs/_build/gettext/.doctrees/bom.doctree differ diff --git a/docs/_build/gettext/.doctrees/buildembossingtool.doctree b/docs/_build/gettext/.doctrees/buildembossingtool.doctree index 43c191f..9c089a9 100644 Binary files a/docs/_build/gettext/.doctrees/buildembossingtool.doctree and b/docs/_build/gettext/.doctrees/buildembossingtool.doctree differ diff --git a/docs/_build/gettext/.doctrees/drivers_mks.doctree b/docs/_build/gettext/.doctrees/drivers_mks.doctree index 0680bc5..5808831 100644 Binary files a/docs/_build/gettext/.doctrees/drivers_mks.doctree and b/docs/_build/gettext/.doctrees/drivers_mks.doctree differ diff --git a/docs/_build/gettext/.doctrees/environment.pickle b/docs/_build/gettext/.doctrees/environment.pickle index a7f1d86..af13e4e 100644 Binary files a/docs/_build/gettext/.doctrees/environment.pickle and b/docs/_build/gettext/.doctrees/environment.pickle differ diff --git a/docs/_build/gettext/.doctrees/firstembossingpage.doctree b/docs/_build/gettext/.doctrees/firstembossingpage.doctree index aaaba55..d3c607c 100644 Binary files a/docs/_build/gettext/.doctrees/firstembossingpage.doctree and b/docs/_build/gettext/.doctrees/firstembossingpage.doctree differ diff --git a/docs/_build/gettext/.doctrees/history.doctree b/docs/_build/gettext/.doctrees/history.doctree index df43d57..d087b3a 100644 Binary files a/docs/_build/gettext/.doctrees/history.doctree and b/docs/_build/gettext/.doctrees/history.doctree differ diff --git a/docs/_build/gettext/.doctrees/index.doctree b/docs/_build/gettext/.doctrees/index.doctree index b2a5613..0b42726 100644 Binary files a/docs/_build/gettext/.doctrees/index.doctree and b/docs/_build/gettext/.doctrees/index.doctree differ diff --git a/docs/_build/gettext/.doctrees/licence.doctree b/docs/_build/gettext/.doctrees/licence.doctree index 9bd303c..b310fb3 100644 Binary files a/docs/_build/gettext/.doctrees/licence.doctree and b/docs/_build/gettext/.doctrees/licence.doctree differ diff --git a/docs/_build/gettext/.doctrees/marlin.doctree b/docs/_build/gettext/.doctrees/marlin.doctree index 7bb878e..987d77e 100644 Binary files a/docs/_build/gettext/.doctrees/marlin.doctree and b/docs/_build/gettext/.doctrees/marlin.doctree differ diff --git a/docs/_build/gettext/.doctrees/testtrad.doctree b/docs/_build/gettext/.doctrees/testtrad.doctree index 661cbd7..6d460f6 100644 Binary files a/docs/_build/gettext/.doctrees/testtrad.doctree and b/docs/_build/gettext/.doctrees/testtrad.doctree differ diff --git a/docs/_build/gettext/assemblage.pot b/docs/_build/gettext/assemblage.pot index f0d072c..021a113 100644 --- a/docs/_build/gettext/assemblage.pot +++ b/docs/_build/gettext/assemblage.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: BrailleRap 6.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-07-04 20:40+0000\n" +"POT-Creation-Date: 2024-10-02 19:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1462,7 +1462,6 @@ msgstr "" msgid "coté moteur" msgstr "" -#: ../../assemblage.rst:1358 #: ../../assemblage.rst:1358 msgid "1" msgstr "" diff --git a/docs/_build/gettext/bom.pot b/docs/_build/gettext/bom.pot index 517bb63..52709b1 100644 --- a/docs/_build/gettext/bom.pot +++ b/docs/_build/gettext/bom.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: BrailleRap 6.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-07-04 19:51+0000\n" +"POT-Creation-Date: 2024-10-02 19:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -61,8 +61,11 @@ msgid "2 planches de contreplaqué 5mm en 900mm x 400mm." msgstr "" #: ../../bom.rst:20 +msgid "lasercut/brapxl-v6.6-planche1_900x400.svg" +msgstr "" + #: ../../bom.rst:21 -msgid "lasercut/.svg" +msgid "lasercut/brapxl-v6-6-planche2_900x400.svg" msgstr "" #: ../../bom.rst:24 @@ -113,6 +116,11 @@ msgstr "" #: ../../bom.rst:80 #: ../../bom.rst:85 #: ../../bom.rst:87 +#: ../../bom.rst:113 +#: ../../bom.rst:114 +#: ../../bom.rst:116 +#: ../../bom.rst:117 +#: ../../bom.rst:118 msgid "1" msgstr "" @@ -130,6 +138,8 @@ msgstr "" #: ../../bom.rst:79 #: ../../bom.rst:82 #: ../../bom.rst:83 +#: ../../bom.rst:112 +#: ../../bom.rst:115 msgid "2" msgstr "" @@ -247,6 +257,30 @@ msgstr "" msgid "Electronique" msgstr "" -#: ../../bom.rst:113 -msgid "2 Moteurs Nema 17 40 N/cm 40mm avec câble (17HS4401) 1 Electro-aimant *tau-826b* 12V 2A 1 MKS GEN 1.4 ou carte compatible Ramps 1.4 ou MKS GEN L 2.1 https://github.com/makerbase-mks 2 drivers DRV8825 avec radiateur 1 1N4004 diode de roue libre ou equivalent (12V 2A) (pour MKS GEN 1.4) 1 Embase Alimentation jack 2.5 1 Alimentation 12v 6A === ===========================================================================================" +#: ../../bom.rst:112 +msgid "Moteurs Nema 17 40 N/cm 40mm avec câble (17HS4401)." +msgstr "" + +#: ../../bom.rst:113 +msgid "Electro-aimant *tau-826b* 12V 2A." +msgstr "" + +#: ../../bom.rst:114 +msgid "MKS GEN 1.4 ou carte compatible Ramps 1.4 ou MKS GEN L 2.1 https://github.com/makerbase-mks." +msgstr "" + +#: ../../bom.rst:115 +msgid "drivers DRV8825 avec radiateur." +msgstr "" + +#: ../../bom.rst:116 +msgid "1N4004 diode de roue libre ou equivalent (12V 2A) (pour MKS GEN 1.4)." +msgstr "" + +#: ../../bom.rst:117 +msgid "Embase Alimentation jack 2.5." +msgstr "" + +#: ../../bom.rst:118 +msgid "Alimentation 12v 6A." msgstr "" diff --git a/docs/bom.rst b/docs/bom.rst index 324c64e..8f5e1d7 100644 --- a/docs/bom.rst +++ b/docs/bom.rst @@ -17,8 +17,8 @@ Pour BrailleRAP XL 2 planches de contreplaqué 5mm en 900mm x 400mm. Les fichiers au format dxf sont disponibles ici : https://github.com/BrailleRap/BrailleRap/tree/master/lasercut - * lasercut/.svg - * lasercut/.svg + * lasercut/brapxl-v6.6-planche1_900x400.svg + * lasercut/brapxl-v6-6-planche2_900x400.svg Pièces imprimées ---------------- @@ -109,13 +109,13 @@ Electronique === =========================================================================================== Qty Type === =========================================================================================== -2 Moteurs Nema 17 40 N/cm 40mm avec câble (17HS4401) -1 Electro-aimant *tau-826b* 12V 2A -1 MKS GEN 1.4 ou carte compatible Ramps 1.4 ou MKS GEN L 2.1 https://github.com/makerbase-mks -2 drivers DRV8825 avec radiateur -1 1N4004 diode de roue libre ou equivalent (12V 2A) (pour MKS GEN 1.4) -1 Embase Alimentation jack 2.5 -1 Alimentation 12v 6A +2 Moteurs Nema 17 40 N/cm 40mm avec câble (17HS4401). +1 Electro-aimant *tau-826b* 12V 2A. +1 MKS GEN 1.4 ou carte compatible Ramps 1.4 ou MKS GEN L 2.1 https://github.com/makerbase-mks. +2 drivers DRV8825 avec radiateur. +1 1N4004 diode de roue libre ou equivalent (12V 2A) (pour MKS GEN 1.4). +1 Embase Alimentation jack 2.5. +1 Alimentation 12v 6A. === =========================================================================================== diff --git a/docs/conf_rtd.py b/docs/conf_rtd.py index c9bda30..137dfda 100644 --- a/docs/conf_rtd.py +++ b/docs/conf_rtd.py @@ -59,9 +59,9 @@ copyright = u'CERN licence V1.2' author = u'BrailleRAP team' # The short X.Y version -version = u'6.5' +version = u'6.6' # The full version, including alpha/beta/rc tags -release = u'6.5' +release = u'6.6' # -- General configuration --------------------------------------------------- diff --git a/docs/locale/en/LC_MESSAGES/bom.po b/docs/locale/en/LC_MESSAGES/bom.po index fd4ac0a..597f8c7 100644 --- a/docs/locale/en/LC_MESSAGES/bom.po +++ b/docs/locale/en/LC_MESSAGES/bom.po @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-07-04 19:51+0000\n" +"POT-Creation-Date: 2024-10-02 19:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.10.1\n" +"Generated-By: Babel 2.16.0\n" # Stephane , 2018. #: ../../bom.rst:2 @@ -28,7 +28,7 @@ msgstr "Laser cutting" #: ../../bom.rst:8 ../../bom.rst:34 msgid "Pour BrailleRAP" -msgstr "" +msgstr "For BrailleRAP" #: ../../bom.rst:9 msgid "2 planches de contreplaqué 5mm en 600mm x 400mm." @@ -36,33 +36,37 @@ msgstr "2 600mm x 400mm 5mm plywood sheets" #: ../../bom.rst:13 ../../bom.rst:21 msgid "Les fichiers au format dxf sont disponibles ici" -msgstr "" +msgstr "The dxf files are availables here : " #: ../../bom.rst:12 ../../bom.rst:20 msgid "https://github.com/BrailleRap/BrailleRap/tree/master/lasercut" -msgstr "" -"The dxf files are availables here : " -"https://github.com/BrailleRap/BrailleRap/tree/master/lasercut" +msgstr "https://github.com/BrailleRap/BrailleRap/tree/master/lasercut" #: ../../bom.rst:12 msgid "lasercut/Braillerap_v6-5-1_600x400-planche1.svg" -msgstr "" +msgstr "lasercut/Braillerap_v6-5-1_600x400-planche1.svg" #: ../../bom.rst:13 msgid "lasercut/Braillerap_v6-5-1-600x400-planche2.svg" -msgstr "" +msgstr "lasercut/Braillerap_v6-5-1-600x400-planche2.svg" #: ../../bom.rst:16 ../../bom.rst:53 msgid "Pour BrailleRAP XL" -msgstr "" +msgstr "For BrailleRAP XL" #: ../../bom.rst:17 msgid "2 planches de contreplaqué 5mm en 900mm x 400mm." msgstr "2 900mm x 400mm 5mm plywood sheets" -#: ../../bom.rst:20 ../../bom.rst:21 -msgid "lasercut/.svg" -msgstr "lasercut/.svg" +#: ../../bom.rst:20 +#, fuzzy +msgid "lasercut/brapxl-v6.6-planche1_900x400.svg" +msgstr "lasercut/Braillerap_v6-5-1_600x400-planche1.svg" + +#: ../../bom.rst:21 +#, fuzzy +msgid "lasercut/brapxl-v6-6-planche2_900x400.svg" +msgstr "lasercut/Braillerap_v6-5-1-600x400-planche2.svg" #: ../../bom.rst:24 msgid "Pièces imprimées" @@ -106,7 +110,8 @@ msgid "Rail de guidage linéaire ( diamètre 8mm ) **330 mm** length" msgstr "Linear rod 8mm diameter **330 mm** length" #: ../../bom.rst:40 ../../bom.rst:41 ../../bom.rst:59 ../../bom.rst:60 -#: ../../bom.rst:80 ../../bom.rst:85 ../../bom.rst:87 +#: ../../bom.rst:80 ../../bom.rst:85 ../../bom.rst:87 ../../bom.rst:113 +#: ../../bom.rst:114 ../../bom.rst:116 ../../bom.rst:117 ../../bom.rst:118 msgid "1" msgstr "1" @@ -119,7 +124,7 @@ msgid "Rail de guidage linéaire ( diamètre 8mm ) **100 mm** length" msgstr "Linear rod 8mm diameter **100 mm** length" #: ../../bom.rst:43 ../../bom.rst:62 ../../bom.rst:79 ../../bom.rst:82 -#: ../../bom.rst:83 +#: ../../bom.rst:83 ../../bom.rst:112 ../../bom.rst:115 msgid "2" msgstr "2" @@ -209,75 +214,106 @@ msgstr "Zip tie selflock 2.5 x 160 mm" #: ../../bom.rst:96 msgid "Carte controleur" -msgstr "" +msgstr "Controller board" #: ../../bom.rst:97 msgid "En fonction de vos souhaits vous pouvez utiliser au choix :" -msgstr "" +msgstr "You can use one of the following :" #: ../../bom.rst:99 msgid "" "Une carte MKS GEN 1.4 (Mega2560) et 2 drivers DRV8825 https://github.com" "/makerbase-mks" msgstr "" +"MKS GEN 1.4 (Mega2560) board and 2 DRV8825 drivers https://github.com" +"/makerbase-mks" #: ../../bom.rst:100 msgid "" "Une carte MKS GEN-L (Mega2560) et 2 drivers DRV8825 https://github.com" "/makerbase-mks" msgstr "" +"MKS GEN-L (Mega2560) board and 2 DRV8825 drivers https://github.com" +"/makerbase-mks" #: ../../bom.rst:101 msgid "" "Une carte MKS TinyBee (ESP32) et 2 drivers TMC2209 https://github.com" "/makerbase-mks" msgstr "" +"MKS TinyBee (ESP32) board and 2 TMC2209 drivers https://github.com" +"/makerbase-mks" #: ../../bom.rst:103 msgid "" "D'autres configuration sont possibles, mais vous devrez effectuer la " "configuration du firmware vous même" msgstr "" +"Many other board configuration are availables. But you will need to build" +" a firmware for it." #: ../../bom.rst:107 msgid "Electronique" msgstr "Electronics" +#: ../../bom.rst:112 +msgid "Moteurs Nema 17 40 N/cm 40mm avec câble (17HS4401)." +msgstr "Nema 17 Motors 40N/cm 40mm with wire (17hs4401)" + #: ../../bom.rst:113 +msgid "Electro-aimant *tau-826b* 12V 2A." +msgstr "Solenoid *tau-826b* 12V 2A." + +#: ../../bom.rst:114 msgid "" -"2 Moteurs Nema 17 40 N/cm 40mm avec câble (17HS4401) 1 Electro-aimant" -" *tau-826b* 12V 2A 1 MKS GEN 1.4 ou carte compatible Ramps 1.4 ou MKS " -"GEN L 2.1 https://github.com/makerbase-mks 2 drivers DRV8825 avec " -"radiateur 1 1N4004 diode de roue libre ou equivalent (12V 2A) (pour " -"MKS GEN 1.4) 1 Embase Alimentation jack 2.5 1 Alimentation 12v 6A ===" -" " -"===========================================================================================" +"MKS GEN 1.4 ou carte compatible Ramps 1.4 ou MKS GEN L 2.1 " +"https://github.com/makerbase-mks." msgstr "" +"MKS GEN 1.4 board or Ramps 1.4 compatible or MKS GEN L 2.1 " +"https://github.com/makerbase-mks." + +#: ../../bom.rst:115 +msgid "drivers DRV8825 avec radiateur." +msgstr "DRV8825 drivers with dissipator" + +#: ../../bom.rst:116 +msgid "1N4004 diode de roue libre ou equivalent (12V 2A) (pour MKS GEN 1.4)." +msgstr "free wheel diod 1n4004 or equivalent (12v 2A) (only for MKS GEN 1.4)" + +#: ../../bom.rst:117 +msgid "Embase Alimentation jack 2.5." +msgstr "Power supply female jack 2.5" + +#: ../../bom.rst:118 +msgid "Alimentation 12v 6A." +msgstr "12V 6A power supply" + +#~ msgid "lasercut/.svg" +#~ msgstr "lasercut/.svg" #~ msgid "" -#~ "MKS GEN 1.4 ou carte compatible " -#~ "Ramps 1.4 ou MKS GEN L 2.1 " -#~ "https://github.com/makerbase-mks" +#~ "2 Moteurs Nema 17 40 N/cm 40mm" +#~ " avec câble (17HS4401) 1 Electro-" +#~ "aimant *tau-826b* 12V 2A 1 MKS" +#~ " GEN 1.4 ou carte compatible Ramps" +#~ " 1.4 ou MKS GEN L 2.1 " +#~ "https://github.com/makerbase-mks 2 drivers " +#~ "DRV8825 avec radiateur 1 1N4004 diode" +#~ " de roue libre ou equivalent (12V " +#~ "2A) (pour MKS GEN 1.4) 1 Embase" +#~ " Alimentation jack 2.5 1 Alimentation " +#~ "12v 6A === " +#~ "===========================================================================================" #~ msgstr "" -#~ "MKS GEN 1.4 or Ramps 1.4 " -#~ "compatible or MKS GEN L 2.1 " -#~ "https://github.com/makerbase-mks" - -#~ msgid "drivers DRV8825 avec radiateur" -#~ msgstr "DRV8825 drivers with cooling radiator" - -#~ msgid "Moteurs Nema 17 40 N/cm 40mm avec câble (17HS4401)" -#~ msgstr "Nema 17 40 N/cm with wire (17HS4401)" - -#~ msgid "Electro-aimant *tau-826b* 12V 2A" -#~ msgstr "Electro-magnet *tau-826* 12V 2A" - -#~ msgid "1N4004 diode de roue libre ou equivalent (12V 2A) (pour MKS GEN 1.4)" -#~ msgstr "1N4004 flyback diode (12V 2A) (only for MKS GEN 1.4)" - -#~ msgid "Embase Alimentation jack 2.5" -#~ msgstr "jack 2.5mm alimentation connector" - -#~ msgid "Alimentation 12v 6A" -#~ msgstr "12V 6A Alimentation" +#~ "2 Nema 17 40 N/cm 40mm with " +#~ "wire (17HS4401)1 Solenoid *tau-826b* " +#~ "12V 2A1 MKS GEN 1.4 or " +#~ "equivalent board Ramps 1.4 ou MKS " +#~ "GEN L 2.1 https://github.com/makerbase-mks2" +#~ " DRV8825 drivers with dissipator1 " +#~ "1N4004 diode de roue libre ou " +#~ "equivalent (12V 2A) (for MKS GEN " +#~ "1.4)1 Power supply Female jack 2.51" +#~ " Power supply 12v 6A " +#~ "==========================================================================================="