Merge pull request '日常更新 2312251559' (#10) from define/firmware_violet_zf:master into master

Reviewed-on: http://git.isthmus.tk:441/btl143/firmware_violet_zf/pulls/10
This commit is contained in:
2023-12-25 16:00:12 +08:00
2 changed files with 26 additions and 35 deletions

View File

@@ -1,37 +1,26 @@
/*********************************************************************************************************************
* CH32V307VCT6 Opensourec Library ????CH32V307VCT6 ???????????????? SDK ??????????????
* Copyright (c) 2022 SEEKFREE ?????
*
* ??????? CH32V307VCT6 ???????????
*
* CH32V307VCT6 ????? ?????????
* ?????????????????????????? GPL??GNU General Public License???? GNU ??<3F><><EFBFBD><EFBFBD>???????????????
* ?? GPL ??? 3 ?<3F><><EFBFBD><EFBFBD>? GPL3.0????????????<3F>ʦ<EFBFBD><CAA6><EFBFBD>????<3F><><EFBFBD><EFBFBD>????<3F><><EFBFBD><EFBFBD>????/???????
*
* ????????????????????????????????<3F><><EFBFBD><EFBFBD>??????<3F>ʦ<EFBFBD><CAA6><EFBFBD>??
* ?????????????????????????????????
* ?????????<3F><><EFBFBD><EFBFBD>GPL
*
* ?????????????????????????? GPL ?????
* ?????<3F><><EFBFBD><EFBFBD>?????<https://www.gnu.org/licenses/>
*
* ?????????
* ?????????? GPL3.0 ????????<3F><><EFBFBD><EFBFBD>? ?????????????????<3F><>
* ?????????????? libraries/doc ???????? GPL3_permission_statement.txt ?????
* ??????????? libraries ??????? ???????????? LICENSE ???
* ?????<3F><><EFBFBD><EFBFBD>?<3F><><EFBFBD><EFBFBD>?????????? ?????????????????????????????????????????
*
* ??????? main
* ??????? ??????????????
* ?<3F><><EFBFBD><EFBFBD>?? ?? libraries/doc ??????? version ??? ?<3F><><EFBFBD><EFBFBD>??
* ???????? MounRiver Studio V1.8.1
* ?????? CH32V307VCT6
* ???????? https://seekfree.taobao.com/
*
* ?????
* ???? ???? ???
* 2022-09-15 ?? W first version
********************************************************************************************************************/
* CH32V307VCT6 Opensourec Library 即(CH32V307VCT6 开源库)是一个基于官方 SDK 接口的第三方开源库
* Copyright (c) 2022 SEEKFREE 逐飞科技
*
* 本文件是 CH32V307VCT6 开源库的一部分
*
* CH32V307VCT6 开源库 是免费软件
* 您可以根据自由软件基金会发布的 GPLGNU General Public License,即 GNU 通用公共许可证)的条款
* GPL 的第 3 版(即 GPL3.0)或(您选择的)任何后来的版本,重新发布和/或修改它
*
* 本开源库的发布是希望它能发挥作用,但并未对其作任何的保证
* 甚至没有隐含的适销性或适合特定用途的保证
* 更多细节请参见 GPL
*
* 您应该在收到本开源库的同时收到一份 GPL 的副本
* 如果没有,请参阅<https://www.gnu.org/licenses/>
*
* 额外注明:
* 本开源库使用 GPL3.0 开源许可证协议 以上许可申明为译文版本
* 许可申明英文版在 libraries/doc 文件夹下的 GPL3_permission_statement.txt 文件中
* 许可证副本在 libraries 文件夹下 即该文件夹下的 LICENSE 文件
* 欢迎各位使用并传播本程序 但修改内容时必须保留逐飞科技的版权声明(即本声明)
********************************************************************************************************************/
#include "zf_common_headfile.h"
#include "gl_headfile.h"
#include "by_pt_button.h"

View File

@@ -141,8 +141,10 @@ void Show_Marked_Image(void)
// 确认边线数组在显示前不会清空
for (uint i = 0; i < PT_MAXLEN; i++) {
ips200_draw_point(START_X + (uint16_t)(mid_right[i][0] * horizontal_zoom_rate), START_Y + (uint16_t)(mid_right[i][1] * vertical_zoom_rate), RGB565_GREEN);
ips200_draw_point(START_X + (uint16_t)(mid_left[i][0] * horizontal_zoom_rate), START_Y + (uint16_t)(mid_left[i][1] * vertical_zoom_rate), RGB565_GREEN);
ips200_draw_point(START_X + (uint16_t)((float)pts_right[i][1] * horizontal_zoom_rate), START_Y + (uint16_t)((float)pts_right[i][0] * vertical_zoom_rate), RGB565_GREEN);
ips200_draw_point(START_X + (uint16_t)((float)pts_right[i][1] * horizontal_zoom_rate) - 1, START_Y + (uint16_t)((float)pts_right[i][0] * vertical_zoom_rate), RGB565_GREEN);
ips200_draw_point(START_X + (uint16_t)((float)pts_left[i][1] * horizontal_zoom_rate), START_Y + (uint16_t)((float)pts_left[i][0] * vertical_zoom_rate), RGB565_YELLOW);
ips200_draw_point(START_X + (uint16_t)((float)pts_left[i][1] * horizontal_zoom_rate) + 1, START_Y + (uint16_t)((float)pts_left[i][0] * vertical_zoom_rate), RGB565_YELLOW);
}
#undef IMAGE_DISPLAY_WIDTH
#undef START_X