From 65fb2e5e20b47bf0ca9cdadbf4f2bd2bc47d2635 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Mon, 18 Jul 2016 21:43:18 +0200 Subject: FSM: Remove TX_ON from OPEN1 This makes it impossible to get stuck with TX_ON if SQ never goes low. Transition from BALISE_OPEN directly goes to OPEN2, regardless of SQ, making a seamless switch from beacon-mode to repeater-mode for the users. --- doc/statemachine.svg | 510 ++++++++++++++++++++++++--------------------------- 1 file changed, 238 insertions(+), 272 deletions(-) (limited to 'doc') diff --git a/doc/statemachine.svg b/doc/statemachine.svg index e44f66b..e7997c7 100644 --- a/doc/statemachine.svg +++ b/doc/statemachine.svg @@ -46,21 +46,6 @@ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1" transform="scale(0.4) rotate(180) translate(10,0)" /> - - - + transform="translate(13.799729,-45.821277)"> + transform="translate(13.799729,-45.821277)"> + transform="translate(35.406872,10.607296)"> OPEN2 + transform="translate(60.942586,119.53586)"> + transform="translate(-48.495417,32.514031)"> ATTENTE + transform="translate(251.1611,59.538404)"> + transform="translate(248.32424,17.722066)"> + transform="translate(90.571319,-171.58529)"> BALISE + transform="translate(-172.09281,-154.10886)"> BALISE + transform="translate(-221.33776,199.19199)"> TEXTE @@ -946,11 +931,11 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path10038" - d="m 390.96544,335.91151 c 1.00384,3.49145 6.35335,15.01146 9.02824,20.8344" + d="m 390.96544,290.09022 c 1.00384,3.49145 6.35335,15.01146 9.02824,20.8344" style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker10040)" /> @@ -958,11 +943,11 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path11598" - d="m 433.89692,444.75545 c 2.33729,3.98735 2.8812,11.71243 2.65165,17.5514" + d="m 433.89692,398.93416 c 2.33729,3.98735 2.8812,11.71243 2.65165,17.5514" style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker11600)" /> @@ -970,17 +955,17 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path12942" - d="m 403.97115,471.39823 c -15.46664,-6.24045 -53.93988,-40.56296 -66.29126,-54.04316" + d="m 403.97115,425.57694 c -15.46664,-6.24045 -53.93988,-40.56296 -66.29126,-54.04316" style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker12944)" /> @@ -988,17 +973,17 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path16086" - d="m 520.96847,408.2706 c -14.35478,-14.81188 15.06824,-25.48247 6.34819,-1.64124" + d="m 520.96847,362.44931 c -14.35478,-14.81188 15.06824,-25.48247 6.34819,-1.64124" style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker16088)" /> @@ -1006,17 +991,17 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path22380" - d="m 374.55726,244.81151 c 17.98979,-13.98842 40.2748,-31.56813 64.02112,-42.70948" + d="m 374.55726,198.99022 c 17.98979,-13.98842 40.2748,-31.56813 64.02112,-42.70948" style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker22382)" /> @@ -1024,23 +1009,23 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path24810" - d="m 247.80389,153.36313 c 50.26013,-4.42053 95.68328,11.63793 106.69317,84.85234" + d="m 247.80389,107.54184 c 50.26013,-4.42053 95.68328,11.63793 106.69317,84.85234" style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker24812)" /> @@ -1048,11 +1033,11 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path27168" - d="m 326.98292,374.78455 c 1.01819,-32.58838 15.89303,-64.17483 25.73249,-97.93123" + d="m 326.98292,328.96326 c 1.01819,-32.58838 15.89303,-64.17483 25.73249,-97.93123" style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker27170)" /> @@ -1060,11 +1045,11 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path29916" - d="M 122.5242,493.56158 C 102.83426,403.14196 239.4221,336.34431 342.61388,272.30763" + d="M 122.5242,447.74029 C 102.83426,357.32067 239.4221,290.52302 342.61388,226.48634" style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker29918)" /> @@ -1072,11 +1057,11 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path30960" - d="m 462.85588,478.71999 c 20.24308,-0.50286 40.78978,-19.48709 49.62375,-36.66316" + d="m 462.85588,432.8987 c 20.24308,-0.50286 40.78978,-19.48709 49.62375,-36.66316" style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker30962)" /> @@ -1084,17 +1069,17 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path34472" - d="m 157.15242,525.03727 c 19.33459,14.12339 53.17209,32.9485 105.40932,38.90649" + d="m 157.15242,479.21598 c 19.33459,14.12339 53.17209,32.9485 105.40932,38.90649" style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> @@ -1102,17 +1087,17 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path36302" - d="m 319.14446,487.55632 c -19.75235,3.75955 -111.85395,8.4461 -133.1339,-11.10552" + d="m 319.14446,441.73503 c -19.75235,3.75955 -111.85395,8.4461 -133.1339,-11.10552" style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker36304)" /> @@ -1120,54 +1105,54 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path38716" - d="M 319.6712,489.74065 C 297.77599,501.35734 200.5048,515.64527 161.3677,513.9508" + d="m 319.6712,443.91936 c -21.89521,11.61669 -119.1664,25.90462 -158.3035,24.21015" style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker38718)" /> 1750 &SQ SQ + transform="matrix(0.99762077,-0.06894062,0.06894062,0.99762077,-11.814308,-17.546925)"> délai200ms + transform="translate(-4.2002711,-45.821277)"> SQ délai 5min &SQ SQ SQ délai 10s + transform="translate(14.809881,-33.699445)"> tECOUTE-tttECOUTE-ttOPEN2 >= 15min + transform="matrix(0.97227733,0.23383071,-0.23383071,0.97227733,124.5168,-127.70933)"> SQ SQ SQ SQ + transform="matrix(0.79590608,0.60542011,-0.60542011,0.79590608,-3.7033161,-103.85239)"> - Glutt-o-matique / Machine d'états + transform="translate(-209.96707,313.90138)"> @@ -1610,33 +1584,33 @@ xml:space="preserve" style="font-style:normal;font-weight:normal;font-size:14px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" x="140" - y="642.36218" + y="596.54089" id="text45486" sodipodi:linespacing="125%">Légende + y="596.54089">Légende + y="646.64081" /> Etat avec TX ON + y="636.54089">Etat avec TX ON Etat avec MOD OFF + y="393.37015" /> + y="395.66122" /> + y="431.55457" /> + y="536.94354" /> + y="186.04276" /> Fréquences & Vitesse CW @@ -1797,21 +1771,21 @@ xml:space="preserve" style="font-style:normal;font-weight:normal;font-size:10px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" x="410" - y="672.36218" + y="626.54089" id="text45588" sodipodi:linespacing="125%">K, U, D, S, R, + y="626.54089">K, U, D, S, R, Message @@ -1819,32 +1793,32 @@ xml:space="preserve" style="font-style:normal;font-weight:normal;font-size:10px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" x="495" - y="657.36218" + y="611.54089" id="text45596" sodipodi:linespacing="125%">Durée dit + y="611.54089">Durée dit Fréquence 80 ms @@ -1852,21 +1826,21 @@ xml:space="preserve" style="font-style:normal;font-weight:normal;font-size:10px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" x="550" - y="702.36218" + y="656.54089" id="text45608" sodipodi:linespacing="125%">960 Hz + y="656.54089">960 Hz G, 73, @@ -1874,38 +1848,38 @@ xml:space="preserve" style="font-style:normal;font-weight:normal;font-size:10px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" x="495" - y="742.36218" + y="696.54089" id="text45616" sodipodi:linespacing="125%">70 ms + y="696.54089">70 ms 696 Hz HI HI, HB9G, @@ -1913,21 +1887,21 @@ xml:space="preserve" style="font-style:normal;font-weight:normal;font-size:10px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" x="410" - y="692.36218" + y="646.54089" id="text45642" sodipodi:linespacing="125%">HB9G 1628m, + y="646.54089">HB9G 1628m, HB9G JN36BK @@ -1946,32 +1920,32 @@ xml:space="preserve" style="font-style:normal;font-weight:normal;font-size:10px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" x="410" - y="742.36218" + y="696.54089" id="text45658" sodipodi:linespacing="125%">Balise QRP/ROS + y="696.54089">Balise QRP/ROS Balise longue + y="716.54089">Balise longue 110 ms @@ -1979,38 +1953,27 @@ xml:space="preserve" style="font-style:normal;font-weight:normal;font-size:10px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" x="550" - y="762.36218" + y="716.54089" id="text45670" sodipodi:linespacing="125%">588 Hz + y="716.54089">588 Hz Balise courte, - 17.07.2016 + transform="matrix(0.95462798,0.29780099,-0.29780099,0.95462798,89.241269,-389.94092)"> (ROS|QRP) & START TM Clarification intervalle petite balise @@ -2115,31 +2078,31 @@ xml:space="preserve" style="font-style:normal;font-weight:normal;font-size:10px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" x="140" - y="852.36218" + y="806.54089" id="text46513" sodipodi:linespacing="125%">Le timer de balise ne compte que lorsque TX OFF.Dès que TX est ON pendant plus de 10 minutes, remise à zéro du timer.Dès que le timer atteint 20 minutes, TX balise et remise à zéro. OPEN - - SQ & CW fini + transform="matrix(0.98310191,0.18305911,-0.18305911,0.98310191,93.444591,-169.31297)"> SQ & CW fini - + sodipodi:role="line">CW fini + + + Glutt-o-matique / Machine d'états2016-07-18 HB9EGM - HB9FOH -- cgit v1.2.3