From 60d142ea546e3b684afa40e0dd03622f8601b2f6 Mon Sep 17 00:00:00 2001 From: Stefan Allius Date: Thu, 27 Mar 2025 23:59:39 +0100 Subject: [PATCH] update class diagramms --- app/docu/proxy_2.svg | 157 +++++++++++++++++++++--------------------- app/docu/proxy_2.yuml | 2 +- app/docu/proxy_3.svg | 157 +++++++++++++++++++++--------------------- app/docu/proxy_3.yuml | 2 +- 4 files changed, 162 insertions(+), 156 deletions(-) diff --git a/app/docu/proxy_2.svg b/app/docu/proxy_2.svg index 232983f..f12d507 100644 --- a/app/docu/proxy_2.svg +++ b/app/docu/proxy_2.svg @@ -4,45 +4,45 @@ - - + + G - + A0 - - - -Example of -instantiation for a -GEN3 inverter! + + + +Example of +instantiation for a +GEN3 inverter! A1 - -<<AbstractIterMeta>> - - -__iter__() + +<<AbstractIterMeta>> + + +__iter__() A14 - -<<ProtocolIfc>> - -_registry - -close() + +<<ProtocolIfc>> + +_registry + +close() A1->A14 - - + + @@ -289,31 +289,34 @@ A13 - -Message - -server_side:bool -mb:Modbus -ifc:AsyncIfc -node_id -header_valid:bool -header_len -data_len -unique_id -sug_area:str -new_data:dict -state:State -shutdown_started:bool -modbus_elms -mb_timer:Timer -mb_timeout -mb_first_timeout -modbus_polling:bool - -_set_mqtt_timestamp() -_timeout() -_send_modbus_cmd() -<async> end_modbus_cmd() + +Message + +server_side:bool +mb:Modbus +ifc:AsyncIfc +node_id +header_valid:bool +header_len +data_len +unique_id +sug_area:str +new_data:dict +state:State +shutdown_started:bool +modbus_elms +mb_timer:Timer +mb_timeout +mb_first_timeout +modbus_polling:bool + +_set_config_parms(inv:dict) +_set_mqtt_timestamp(key, ts) +_timeout() +_send_modbus_cmd() +<async>send_modbus_cmd() +_send_modbus_scan() +_dump_modbus_scan() close() inc_counter() dec_counter() @@ -321,51 +324,51 @@ A13->A5 - - -use + + +use A13->A10 - - + + A14->A13 - - + + A15 - -Modbus - -que -snd_handler -rsp_handler -timeout -max_retires -last_xxx -err -retry_cnt -req_pend -tim - -build_msg() -recv_req() -recv_resp() -close() + +Modbus + +que +snd_handler +rsp_handler +timeout +max_retires +last_xxx +err +retry_cnt +req_pend +tim + +build_msg() +recv_req() +recv_resp() +close() A15->A13 - - -has -0..1 + + +has +0..1 diff --git a/app/docu/proxy_2.yuml b/app/docu/proxy_2.yuml index 5138428..c6bd9c6 100644 --- a/app/docu/proxy_2.yuml +++ b/app/docu/proxy_2.yuml @@ -31,7 +31,7 @@ [Talent]->[InfosG3] -[Message|server_side:bool;mb:Modbus;ifc:AsyncIfc;node_id;header_valid:bool;header_len;data_len;unique_id;sug_area:str;new_data:dict;state:State;shutdown_started:bool;modbus_elms;mb_timer:Timer;mb_timeout;mb_first_timeout;modbus_polling:bool|_set_mqtt_timestamp();_timeout();_send_modbus_cmd(); end_modbus_cmd();close();inc_counter();dec_counter()] +[Message|server_side:bool;mb:Modbus;ifc:AsyncIfc;node_id;header_valid:bool;header_len;data_len;unique_id;sug_area:str;new_data:dict;state:State;shutdown_started:bool;modbus_elms;mb_timer:Timer;mb_timeout;mb_first_timeout;modbus_polling:bool|_set_config_parms(inv:dict);_set_mqtt_timestamp(key, ts);_timeout();_send_modbus_cmd();send_modbus_cmd();_send_modbus_scan();_dump_modbus_scan();close();inc_counter();dec_counter()] [Message]use->[<>] [<>|_registry|close()] diff --git a/app/docu/proxy_3.svg b/app/docu/proxy_3.svg index 37fc587..d74dfa5 100644 --- a/app/docu/proxy_3.svg +++ b/app/docu/proxy_3.svg @@ -4,45 +4,45 @@ - - + + G - + A0 - - - -Example of -instantiation for a -GEN3PLUS inverter! + + + +Example of +instantiation for a +GEN3PLUS inverter! A1 - -<<AbstractIterMeta>> - - -__iter__() + +<<AbstractIterMeta>> + + +__iter__() A14 - -<<ProtocolIfc>> - -_registry - -close() + +<<ProtocolIfc>> + +_registry + +close() A1->A14 - - + + @@ -282,31 +282,34 @@ A13 - -Message - -server_side:bool -mb:Modbus -ifc:AsyncIfc -node_id -header_valid:bool -header_len -data_len -unique_id -sug_area:str -new_data:dict -state:State -shutdown_started:bool -modbus_elms -mb_timer:Timer -mb_timeout -mb_first_timeout -modbus_polling:bool - -_set_mqtt_timestamp() -_timeout() -_send_modbus_cmd() -<async> end_modbus_cmd() + +Message + +server_side:bool +mb:Modbus +ifc:AsyncIfc +node_id +header_valid:bool +header_len +data_len +unique_id +sug_area:str +new_data:dict +state:State +shutdown_started:bool +modbus_elms +mb_timer:Timer +mb_timeout +mb_first_timeout +modbus_polling:bool + +_set_config_parms(inv:dict) +_set_mqtt_timestamp(key, ts) +_timeout() +_send_modbus_cmd() +<async>send_modbus_cmd() +_send_modbus_scan() +_dump_modbus_scan() close() inc_counter() dec_counter() @@ -314,51 +317,51 @@ A13->A5 - - -use + + +use A13->A10 - - + + A14->A13 - - + + A15 - -Modbus - -que -snd_handler -rsp_handler -timeout -max_retires -last_xxx -err -retry_cnt -req_pend -tim - -build_msg() -recv_req() -recv_resp() -close() + +Modbus + +que +snd_handler +rsp_handler +timeout +max_retires +last_xxx +err +retry_cnt +req_pend +tim + +build_msg() +recv_req() +recv_resp() +close() A15->A13 - - -has -0..1 + + +has +0..1 diff --git a/app/docu/proxy_3.yuml b/app/docu/proxy_3.yuml index 499c93f..45bb489 100644 --- a/app/docu/proxy_3.yuml +++ b/app/docu/proxy_3.yuml @@ -30,7 +30,7 @@ [SolarmanV5]->[InfosG3P] -[Message|server_side:bool;mb:Modbus;ifc:AsyncIfc;node_id;header_valid:bool;header_len;data_len;unique_id;sug_area:str;new_data:dict;state:State;shutdown_started:bool;modbus_elms;mb_timer:Timer;mb_timeout;mb_first_timeout;modbus_polling:bool|_set_mqtt_timestamp();_timeout();_send_modbus_cmd(); end_modbus_cmd();close();inc_counter();dec_counter()] +[Message|server_side:bool;mb:Modbus;ifc:AsyncIfc;node_id;header_valid:bool;header_len;data_len;unique_id;sug_area:str;new_data:dict;state:State;shutdown_started:bool;modbus_elms;mb_timer:Timer;mb_timeout;mb_first_timeout;modbus_polling:bool|_set_config_parms(inv:dict);_set_mqtt_timestamp(key, ts);_timeout();_send_modbus_cmd();send_modbus_cmd();_send_modbus_scan();_dump_modbus_scan();close();inc_counter();dec_counter()] [Message]use->[<>] [<>|_registry|close()]