Master merge #112
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
|
|
||
| #ifndef __CHARGER_PRE_DEFINE_H__ | ||
| #define __CHARGER_PRE_DEFINE_H__ | ||
|
|
||
| // 统一编译选项, 把AC/DC, MT7628/AM3354/SSD202合并到一个项目中, 集中处理各种编译选项 | ||
| #define COMPILE_FOR_AC_X86 0 | ||
| #define COMPILE_FOR_AC_MT7628 1 // MT7628主板, 目前用于家用塑壳和商用铁壳/落地 | ||
| #define COMPILE_FOR_DC_AM3354 2 // AM3354主板, 目前用于嘉盛直流桩 | ||
| #define COMPILE_FOR_AC_SSD202 3 // SSD202主板, 目前替代MT7628主板, 后续可能替换直流桩, 待定 | ||
| #define COMPILE_FOR_CABINET_AM3354 4 // AM3354主板, 目前用于分体式直流桩 | ||
| #define COMPILE_FOR_CABINET_SSD202 5 // SSD202控制盒主板, 分体式直流桩的终端控制盒用于小直流和移动桩时使用 | ||
| #define COMPILE_FOR_SSD202_43 6 //4.3寸屏幕 | ||
|
|
||
| #define CHARGER_TYPE_AC_ONLY 1 // 全交流枪充电桩 | ||
| #define CHARGER_TYPE_DC 2 // 直流枪充电桩, 可包含交流(交直流一体) | ||
| #define CHARGER_TYPE_DC_CABINET 3 // 直流分体充电桩(可包含交流终端) 和采用分体架构的小直流等 | ||
|
|
||
| #endif |
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "name": "fragment_btn_text", | ||
| "desc": "帮助按钮类似的130*40按钮, 内置一个文本", | ||
| "type": "button", | ||
| "properties": { | ||
| "style":"style-button-help-language" | ||
| }, | ||
| "children": [ | ||
| { | ||
| "name": "text", | ||
| "desc": "按钮上的文本", | ||
| "type": "label", | ||
| "properties": { | ||
| "text": "Help", | ||
| "align": "LV_ALIGN_CENTER", | ||
| "style": "style-text-primary", | ||
| "text_align": "LV_TEXT_ALIGN_CENTER" | ||
| } | ||
| } | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| { | ||
| "name": "fragment_btn_language", | ||
| "desc": "语言按钮, 包含一个图标和一个文字", | ||
| "type": "button", | ||
| "properties": { | ||
| "style": "style-button-help-language" | ||
| }, | ||
| "children": [ | ||
| { | ||
| "name": "icon", | ||
| "desc": "图标", | ||
| "type": "image", | ||
| "properties": { | ||
| "x_ofs":22, | ||
| "width": 32, | ||
| "height": 32, | ||
| "align": "LV_ALIGN_LEFT_MID", | ||
| "src": "english", | ||
| "text_align": "LV_TEXT_ALIGN_CENTER" | ||
| } | ||
| }, | ||
| { | ||
| "name": "label", | ||
| "desc": "文字", | ||
| "type": "label", | ||
| "properties": { | ||
| "text": "English", | ||
| "x_ofs":56, | ||
| "align": "LV_ALIGN_LEFT_MID", | ||
| "style": "style-text-primary", | ||
| "text_align": "LV_TEXT_ALIGN_CENTER" | ||
| } | ||
| } | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "name": "fragment_btn_primary", | ||
| "desc": "close按钮", | ||
| "type": "button", | ||
| "properties": { | ||
| "style": "style-continue_button_session_error" | ||
| }, | ||
| "children": [ | ||
| { | ||
| "name": "btn_label", | ||
| "type": "label", | ||
| "properties": { | ||
| "text": "", | ||
| "align" : "LV_ALIGN_CENTER", | ||
| "style": "style-continue_label_session_error", | ||
| "text_align": "LV_TEXT_ALIGN_CENTER" | ||
| } | ||
| } | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| { | ||
| "name": "fragment_connector_card_quad", | ||
| "desc": "四枪的单个卡片, 有 Idle/Starting/Charging/Suspend/Finished/Reserved/Fault/Unavailable", | ||
| "type": "button", | ||
| "properties": { | ||
| "style": "style-connector-quad-default", | ||
| "width": 184, | ||
| "height": 123, | ||
| "style_checked": "style-connector-quad-checked" | ||
| }, | ||
| "children": [ | ||
| { | ||
| "name": "conn_card_id", | ||
| "desc": "枪号带背景", | ||
| "type": "fragment", | ||
| "fragment_name" : "fragment_conn_card_id", | ||
|
|
||
| "properties": { | ||
| "x": 14, | ||
| "y": 14 | ||
| } | ||
| }, | ||
| { | ||
| "name": "conn_card_state", | ||
| "desc" : "当前状态, 右对齐, 注意不同语言越界", | ||
| "type": "label", | ||
| "properties": { | ||
| "text": "Idle", | ||
| "x_ofs": -14, | ||
| "y_ofs": 19, | ||
| "align": "LV_ALIGN_TOP_RIGHT", | ||
| "style": "style-connector-quad-default-state-text", | ||
| "text_align": "LV_TEXT_ALIGN_CENTER" | ||
| } | ||
| }, | ||
| { | ||
| "name": "conn_card_type", | ||
| "desc": "充电枪类型, 左对齐, Idle/Suspend/Fault/Starting/Stopping/Error/Fault/Unavailable", | ||
| "type": "label", | ||
| "properties": { | ||
| "text": "CCS2(DC)", | ||
| "x": 14, | ||
| "y": 65, | ||
| "style": "style-connector-quad-default-type-text", | ||
| "text_align": "LV_TEXT_ALIGN_CENTER" | ||
| } | ||
| }, | ||
| { | ||
| "name": "conn_card_power_rated", | ||
| "desc": "额定功率, 左对齐, Idle/Suspend/Fault/Starting/Stopping/Error/Fault/Unavailable", | ||
| "type": "label", | ||
| "properties": { | ||
| "text": "120.0kW", | ||
| "x": 14, | ||
| "y": 89, | ||
| "style": "style-connector-quad-default-power-text", | ||
| "text_align": "LV_TEXT_ALIGN_CENTER" | ||
| } | ||
| }, | ||
| { | ||
| "name": "conn_card_type_icon", | ||
| "desc" : "充电枪类型图标, Idle/Suspend/Fault/Starting/Stopping/Error/Fault/Unavailable", | ||
| "type": "image", | ||
| "properties": { | ||
| "src": "ccs2-dc", | ||
| "width": 47, | ||
| "height": 47, | ||
| "x_ofs": -14, | ||
| "y_ofs": -14, | ||
| "align": "LV_ALIGN_BOTTOM_RIGHT" | ||
| } | ||
| }, | ||
| { | ||
| "name": "conn_card_time_title", | ||
| "desc": "计时时间提示信息, Reserved为剩余时间, Finished为占位时间", | ||
| "type": "label", | ||
| "properties": { | ||
| "text": "Idle time", | ||
| "x": 14, | ||
| "y": 65, | ||
| "hidden": true, | ||
| "style": "style-connector-quad-default-power-text", | ||
| "text_align": "LV_TEXT_ALIGN_CENTER" | ||
| } | ||
| }, | ||
| { | ||
| "name": "conn_card_time", | ||
| "desc": "计时时间值, Reserved为剩余时间, Finished为占位时间", | ||
| "type": "label", | ||
| "properties": { | ||
| "text": "04:24", | ||
| "x": 14, | ||
| "y": 89, | ||
| "hidden": true, | ||
| "style": "style-current_time", | ||
| "text_align": "LV_TEXT_ALIGN_CENTER" | ||
| } | ||
| }, | ||
| { | ||
| "name": "conn_card_soc_bar", | ||
| "desc": "充电中SoC进度条", | ||
| "type": "bar", | ||
| "properties": { | ||
| "x_ofs": 14, | ||
| "y_ofs": 65, | ||
| "align": "LV_ALIGN_TOP_LEFT", | ||
| "style": "style-charging_bar_bg_size", | ||
| "style_indic": "style-charging_bar_indic" | ||
| } | ||
| }, | ||
| { | ||
| "name": "conn_card_soc", | ||
| "desc": "充电中SoC值", | ||
| "type": "label", | ||
| "properties": { | ||
| "text": "12%", | ||
| "x_ofs": 14, | ||
| "y_ofs": 89, | ||
| "width": 50, | ||
| "height": 20, | ||
| "align": "LV_ALIGN_TOP_LEFT", | ||
| "hidden": true, | ||
| "style": "style-connector-quad-default-power-text", | ||
| "text_align": "LV_TEXT_ALIGN_CENTER" | ||
| } | ||
| }, | ||
| { | ||
| "name": "conn_card_power_real", | ||
| "desc": "充电中实时功率, 右对齐", | ||
| "type": "label", | ||
| "properties": { | ||
| "text": "102.5kW", | ||
| "x_ofs": -14, | ||
| "y_ofs": 89, | ||
| "align": "LV_ALIGN_TOP_RIGHT", | ||
| "style": "style-connector-quad-default-power-text", | ||
| "text_align": "LV_TEXT_ALIGN_CENTER" | ||
| } | ||
| }, | ||
| { | ||
| "name": "conn_card_plug_gun_icon", | ||
| "desc" : "插枪提示的绿色图标", | ||
| "type": "image", | ||
| "properties": { | ||
| "src": "icon_connected", | ||
| "width": 20, | ||
| "height": 20, | ||
| "x": 148, | ||
| "y": 91 | ||
| } | ||
| } | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "name": "fragment_conn_card_id", | ||
| "desc": "枪id, 内置一个文本", | ||
| "type": "flex", | ||
| "properties": { | ||
| "style": "style-connector-quad-default-num-border" | ||
| }, | ||
| "children": [ | ||
| { | ||
| "name": "NoText", | ||
| "type": "label", | ||
| "properties": { | ||
| "text": "1", | ||
| "align" : "LV_ALIGN_CENTER", | ||
| "style": "style-connector-quad-default-num-text", | ||
| "text_align": "LV_TEXT_ALIGN_CENTER" | ||
| } | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
P2: Forcing CMAKE_C_COMPILER to gcc overrides user/toolchain selection and can break portability for non-gcc environments.
Prompt for AI agents