Skip to content

Commit f017c82

Browse files
huaweiwxhuaweiwx
committed
update keywords
1 parent 6f905ee commit f017c82

5 files changed

Lines changed: 45 additions & 51 deletions

File tree

‎sduino/hardware/sduino/stm8/libraries/SevenSegment/Example/VCmeter_vc288/VCmeter_vc288.ino‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@
2222
// SevenSegment (instancename,da, db, dc, dd, de, df, dg, dp, d01, d02, d03, d04, d11, d12, d13, d14); // 2*4
2323

2424
// SevenSegment (instancename,da, db, dc, dd, de, df, dg, dp, d01, d02, d03, d11, d12, d13); // 2*3
25-
SevenSegment(seg7d, PD1, PA3, PC3, PC6, PC7, PC4, PA2, PC5, PD4 , PD6, PD5, PB5, PB4, PA1); /*VC288 board use 2*3 digits*/
25+
SevenSegment(seg7d3, PD1, PA3, PC3, PC6, PC7, PC4, PA2, PC5, PD4 , PD6, PD5, PB5, PB4, PA1); /*VC288 board use 2*3 digits*/
2626

2727
// SevenSegment (instancename,da, db, dc, dd, de, df, dg, dp, d1, d2, d3, d4); // 1*4
2828
// SevenSegment (instancename,da, db, dc, dd, de, df, dg, dp, d1, d2, d3); // 1*3
29-
// SevenSegment(seg7d, PC4, PB5, PC7, PD1, PD3, PC3, PB4, PD2, PC6 , PC5, PA3); /*3DigitsVolt board use 1*3 digits*/
29+
// SevenSegment(seg7d3, PC4, PB5, PC7, PD1, PD3, PC3, PB4, PD2, PC6 , PC5, PA3); /*3DigitsVolt board use 1*3 digits*/
3030

3131
//#define VPIN PD6 //3DigitsVolt PD6(电压检测输入脚 PD2/3/5/6 之一)
3232
#define VPIN PD3 //VC288 PD3
3333
#define IPIN PD2 //VC288 PD2
3434

3535
void setup() {
36-
seg7d_begin(1); //0/1 共阳/阴7段数码管初始化
36+
seg7d3_begin(1); //0/1 共阳/阴7段数码管初始化
3737
pinMode(VPIN, INPUT);
3838
pinMode(IPIN, INPUT);
3939
}
@@ -49,30 +49,30 @@ void loop() {
4949
for (uint8_t i = 0; i < 32; i++) {
5050
v_in += analogRead(VPIN);
5151
c_in += analogRead(VPIN);
52-
for (uint8_t j = 0; j < 5; j++) seg7d_display(); //刷新 5 次
52+
for (uint8_t j = 0; j < 5; j++) seg7d3_display(); //刷新 5 次
5353
}
5454

5555

5656
#if 0 // 首次设置为1:显示校准值,并修改Vk 和 Ik /　然后再改为0: 正常工作状态, 显示 电压电流
57-
SevenSegment_setline(0);
58-
seg7d_showDEC(v_in / 32); // 校准值Vk/10V(30V 档）
57+
seg7d3_setLine(0);
58+
seg7d3_showDEC(v_in / 32); // 校准值Vk/10V(30V 档）
5959

60-
SevenSegment_setline(1);
61-
seg7d_showDEC(c_in / 32); // 校准值Ik/1A(10A 档）
60+
seg7d3_setLine(1);
61+
seg7d3_showDEC(c_in / 32); // 校准值Ik/1A(10A 档）
6262

6363
#else
6464
v_in *= 100;
6565
c_in *= 100;
6666

6767
//可用seg7d3_showFloat 直接显示浮点数，但计算慢，占内存
6868
//用整数显示，快速资源占用少
69-
SevenSegment_setline(0); //第 0 行 电压
70-
seg7d_showDEC(v_in / Vk); //显示整数,会清小数点显示,需重设
71-
seg7d_setpoint(1); // 重设显示小数点
69+
seg7d3_setLine(0); //第 0 行 电压
70+
seg7d3_showDEC(v_in / Vk); //显示整数,会清小数点显示,需重设
71+
seg7d3_setPoint(1); // 重设显示小数点
7272

73-
SevenSegment_setline(1); //第 1行 电流
74-
seg7d_showDEC(c_in / Ik);
75-
seg7d_setpoint(1);
73+
seg7d3_setLine(1); //第 1行 电流
74+
seg7d3_showDEC(c_in / Ik);
75+
seg7d3_setPoint(1);
7676
#endif
7777
}
7878

‎sduino/hardware/sduino/stm8/libraries/SevenSegment/Example/Vmeter_3digits/Vmeter_3digits.ino‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void loop() {
5757
//用整数显示，快速资源占用少
5858
seg7d3_showDEC(vin / Vk); //显示整数,会清小数点显示,需重设
5959

60-
seg7d3_setpoint(1); // 重设显示小数点
60+
seg7d3_setPoint(1); // 重设显示小数点
6161
#endif
6262
}
6363

‎sduino/hardware/sduino/stm8/libraries/SevenSegment/SevenSegment.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ void SevenSegment_begin(uint8_t inv){
139139
}
140140
}
141141

142-
void SevenSegment_show(uint8_t c,uint8_t i){
142+
void SevenSegment_showChar(uint8_t c,uint8_t i){
143143
showBuf[i+line*4] = c;
144144
}
145145

@@ -153,18 +153,18 @@ void SevenSegment_showErr(void)
153153
}
154154
}
155155

156-
void SevenSegment_setline(uint8_t l){
156+
void SevenSegment_setLine(uint8_t l){
157157
if(lines){
158158
if(l) line = 1;
159159
else line = 0;
160160
}
161161
}
162162

163-
void SevenSegment_setpoint(uint8_t p){
163+
void SevenSegment_setPoint(uint8_t p){
164164
point[line]=p;
165165
}
166166

167-
void SevenSegment_setpos(uint8_t i){
167+
void SevenSegment_setPos(uint8_t i){
168168
pos[line]=i;
169169
}
170170

‎sduino/hardware/sduino/stm8/libraries/SevenSegment/SevenSegment.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ void SevenSegment_showFloat(float num);
3939
void SevenSegment_showHEX(uint32_t num);
4040
void SevenSegment_display(void);
4141

42-
void SevenSegment_setline(uint8_t l);
42+
void SevenSegment_setLine(uint8_t l);
4343
void SevenSegment_setpoint(uint8_t p);
4444
void SevenSegment_setpos(uint8_t i);
4545

@@ -111,7 +111,7 @@ size_t SevenSegment_write(uint8_t);
111111
X2Method1 (SevenSegment,instance,showDEC,int16_t) \
112112
X2Method1 (SevenSegment,instance,showFloat,float) \
113113
X2Method1 (SevenSegment,instance,showHEX,uint32_t) \
114-
X2Method1 (SevenSegment,instance,setline,uint8_t) \
114+
X2Method1 (SevenSegment,instance,setLine,uint8_t) \
115115
X2Method1 (SevenSegment,instance,setpoint,uint8_t) \
116116
X2Method1 (SevenSegment,instance,setpos,uint8_t) \
117117
X2Method0 (SevenSegment,instance,display) \

‎sduino/hardware/sduino/stm8/libraries/SevenSegment/keywords.txt‎

Lines changed: 24 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -19,69 +19,63 @@ seg7d4i KEYWORD1 SevenSegment
1919
seg7d4v KEYWORD1 SevenSegment
2020

2121
seg7d3_begin KEYWORD2 SevenSegment
22-
seg7d3_beginInv KEYWORD2 SevenSegment
23-
seg7d3_show KEYWORD2 SevenSegment
22+
seg7d3_showChar KEYWORD2 SevenSegment
2423
seg7d3_showHEX KEYWORD2 SevenSegment
2524
seg7d3_showDEC KEYWORD2 SevenSegment
26-
seg7d3_pos KEYWORD2 SevenSegment
27-
seg7d3_setpoint KEYWORD2 SevenSegment
25+
seg7d3_setPos KEYWORD2 SevenSegment
26+
seg7d3_setPoint KEYWORD2 SevenSegment
2827
seg7d3_display KEYWORD2 SevenSegment
29-
seg7d3_clear KEYWORD2 SevenSegment
28+
seg7d3_setLine KEYWORD2 SevenSegment
3029
seg7d3_write KEYWORD2 SevenSegment
3130

3231
seg7d3i_begin KEYWORD2 SevenSegment
33-
seg7d3i_beginInv KEYWORD2 SevenSegment
34-
seg7d3i_show KEYWORD2 SevenSegment
32+
seg7d3i_showChar KEYWORD2 SevenSegment
3533
seg7d3i_showHEX KEYWORD2 SevenSegment
3634
seg7d3i_showDEC KEYWORD2 SevenSegment
37-
seg7d3i_pos KEYWORD2 SevenSegment
38-
seg7d3i_setpoint KEYWORD2 SevenSegment
35+
seg7d3i_setPos KEYWORD2 SevenSegment
36+
seg7d3i_setPoint KEYWORD2 SevenSegment
3937
seg7d3i_display KEYWORD2 SevenSegment
40-
seg7d3i_clear KEYWORD2 SevenSegment
38+
seg7d3i_setLine KEYWORD2 SevenSegment
4139
seg7d3i_write KEYWORD2 SevenSegment
4240

4341
seg7d3v_begin KEYWORD2 SevenSegment
44-
seg7d3v_beginInv KEYWORD2 SevenSegment
45-
seg7d3v_show KEYWORD2 SevenSegment
42+
seg7d3v_showChar KEYWORD2 SevenSegment
4643
seg7d3v_showHEX KEYWORD2 SevenSegment
4744
seg7d3v_showDEC KEYWORD2 SevenSegment
48-
seg7d3v_pos KEYWORD2 SevenSegment
49-
seg7d3v_setpoint KEYWORD2 SevenSegment
45+
seg7d3v_setPos KEYWORD2 SevenSegment
46+
seg7d3v_setPoint KEYWORD2 SevenSegment
5047
seg7d3v_display KEYWORD2 SevenSegment
51-
seg7d3v_clear KEYWORD2 SevenSegment
48+
seg7d3v_setLine KEYWORD2 SevenSegment
5249
seg7d3v_write KEYWORD2 SevenSegment
5350

5451
seg7d4_begin KEYWORD2 SevenSegment
55-
seg7d4_beginInv KEYWORD2 SevenSegment
56-
seg7d4_show KEYWORD2 SevenSegment
52+
seg7d4_showChar KEYWORD2 SevenSegment
5753
seg7d4_showHEX KEYWORD2 SevenSegment
5854
seg7d4_showDEC KEYWORD2 SevenSegment
59-
seg7d4_pos KEYWORD2 SevenSegment
60-
seg7d4_setpoint KEYWORD2 SevenSegment
55+
seg7d4_setPos KEYWORD2 SevenSegment
56+
seg7d4_setPoint KEYWORD2 SevenSegment
6157
seg7d4_display KEYWORD2 SevenSegment
62-
seg7d4_clear KEYWORD2 SevenSegment
58+
seg7d4_setLine KEYWORD2 SevenSegment
6359
seg7d4_write KEYWORD2 SevenSegment
6460

6561
seg7d4i_begin KEYWORD2 SevenSegment
66-
seg7d4i_beginInv KEYWORD2 SevenSegment
67-
seg7d4i_show KEYWORD2 SevenSegment
62+
seg7d4i_showChar KEYWORD2 SevenSegment
6863
seg7d4i_showHEX KEYWORD2 SevenSegment
6964
seg7d4i_showDEC KEYWORD2 SevenSegment
70-
seg7d4i_pos KEYWORD2 SevenSegment
71-
seg7d4i_setpoint KEYWORD2 SevenSegment
65+
seg7d4i_setPos KEYWORD2 SevenSegment
66+
seg7d4i_setPoint KEYWORD2 SevenSegment
7267
seg7d4i_display KEYWORD2 SevenSegment
73-
seg7d4i_clear KEYWORD2 SevenSegment
68+
seg7d4i_setLine KEYWORD2 SevenSegment
7469
seg7d4i_write KEYWORD2 SevenSegment
7570

7671
seg7d4v_begin KEYWORD2 SevenSegment
77-
seg7d4v_beginInv KEYWORD2 SevenSegment
78-
seg7d4v_show KEYWORD2 SevenSegment
72+
seg7d4v_showChar KEYWORD2 SevenSegment
7973
seg7d4v_showHEX KEYWORD2 SevenSegment
8074
seg7d4v_showDEC KEYWORD2 SevenSegment
81-
seg7d4v_pos KEYWORD2 SevenSegment
82-
seg7d4v_setpoint KEYWORD2 SevenSegment
75+
seg7d4v_setPos KEYWORD2 SevenSegment
76+
seg7d4v_setPoint KEYWORD2 SevenSegment
8377
seg7d4v_display KEYWORD2 SevenSegment
84-
seg7d4v_clear KEYWORD2 SevenSegment
78+
seg7d4v_setLine KEYWORD2 SevenSegment
8579
seg7d4v_write KEYWORD2 SevenSegment
8680

8781
#######################################

0 commit comments

Comments
 (0)