Skip to content

Commit 01ce4ec

Browse files
pikasTechpikasTech
committed
change deivce to device
1 parent bb10916 commit 01ce4ec

18 files changed

+216
-217
lines changed

‎demo/stm32g070/MDK-ARM/stm32g070.uvprojx

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
<TargetName>stm32g070</TargetName>
1111
<ToolsetNumber>0x4</ToolsetNumber>
1212
<ToolsetName>ARM-ADS</ToolsetName>
13-
<pCCUsed>6160000::V6.16::ARMCLANG</pCCUsed>
13+
<pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
1414
<uAC6>1</uAC6>
1515
<TargetOption>
1616
<TargetCommonOption>
1717
<Device>STM32G070CBTx</Device>
1818
<Vendor>STMicroelectronics</Vendor>
19-
<PackID>Keil.STM32G0xx_DFP.1.3.0</PackID>
19+
<PackID>Keil.STM32G0xx_DFP.1.2.0</PackID>
2020
<PackURL>http://www.keil.com/pack/</PackURL>
2121
<Cpu>IRAM(0x20000000-0x20008FFF) IROM(0x8000000-0x801FFFF) CLOCK(8000000) CPUTYPE("Cortex-M0+") TZ</Cpu>
2222
<FlashUtilSpec></FlashUtilSpec>
@@ -137,7 +137,7 @@
137137
<DriverSelection>4101</DriverSelection>
138138
</Flash1>
139139
<bUseTDR>1</bUseTDR>
140-
<Flash2>BIN\UL2V8M.DLL</Flash2>
140+
<Flash2>BIN\UL2CM3.DLL</Flash2>
141141
<Flash3></Flash3>
142142
<Flash4></Flash4>
143143
<pFcarmOut></pFcarmOut>
@@ -185,7 +185,6 @@
185185
<uocXRam>0</uocXRam>
186186
<RvdsVP>0</RvdsVP>
187187
<RvdsMve>0</RvdsMve>
188-
<RvdsCdeCp>0</RvdsCdeCp>
189188
<hadIRAM2>0</hadIRAM2>
190189
<hadIROM2>0</hadIROM2>
191190
<StupSel>8</StupSel>
@@ -352,7 +351,7 @@
352351
<NoWarn>0</NoWarn>
353352
<uSurpInc>0</uSurpInc>
354353
<useXO>0</useXO>
355-
<ClangAsOpt>4</ClangAsOpt>
354+
<uClangAs>0</uClangAs>
356355
<VariousControls>
357356
<MiscControls></MiscControls>
358357
<Define></Define>
@@ -624,24 +623,24 @@
624623
<FilePath>..\pikascript\pikascript-api\PikaStdLib_SysObj-api.c</FilePath>
625624
</File>
626625
<File>
627-
<FileName>PikaStdDeivce_GPIO-api.c</FileName>
626+
<FileName>STM32_GPIO-api.c</FileName>
628627
<FileType>1</FileType>
629-
<FilePath>..\pikascript\pikascript-api\PikaStdDeivce_GPIO-api.c</FilePath>
628+
<FilePath>..\pikascript\pikascript-api\STM32_GPIO-api.c</FilePath>
630629
</File>
631630
<File>
632-
<FileName>STM32_GPIO-api.c</FileName>
631+
<FileName>STM32_Time-api.c</FileName>
633632
<FileType>1</FileType>
634-
<FilePath>..\pikascript\pikascript-api\STM32_GPIO-api.c</FilePath>
633+
<FilePath>..\pikascript\pikascript-api\STM32_Time-api.c</FilePath>
635634
</File>
636635
<File>
637-
<FileName>PikaStdDeivce_Time-api.c</FileName>
636+
<FileName>PikaStdDevice_GPIO-api.c</FileName>
638637
<FileType>1</FileType>
639-
<FilePath>..\pikascript\pikascript-api\PikaStdDeivce_Time-api.c</FilePath>
638+
<FilePath>..\pikascript\pikascript-api\PikaStdDevice_GPIO-api.c</FilePath>
640639
</File>
641640
<File>
642-
<FileName>STM32_Time-api.c</FileName>
641+
<FileName>PikaStdDevice_Time-api.c</FileName>
643642
<FileType>1</FileType>
644-
<FilePath>..\pikascript\pikascript-api\STM32_Time-api.c</FilePath>
643+
<FilePath>..\pikascript\pikascript-api\PikaStdDevice_Time-api.c</FilePath>
645644
</File>
646645
</Files>
647646
</Group>

‎demo/stm32g070/pikascript/PikaStdDeivce.py renamed to ‎demo/stm32g070/pikascript/PikaStdDevice.py

File renamed without changes.

‎demo/stm32g070/pikascript/STM32.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import PikaStdDeivce
1+
import PikaStdDevice
22

33

4-
class GPIO(PikaStdDeivce.GPIO):
4+
class GPIO(PikaStdDevice.GPIO):
55
# override
66
def platformHigh():
77
pass
@@ -23,7 +23,7 @@ def platformSetMode(mode: str):
2323
pass
2424

2525

26-
class Time(PikaStdDeivce.Time):
26+
class Time(PikaStdDevice.Time):
2727
# override
2828
def sleep_s(s: int):
2929
pass

‎demo/stm32g070/pikascript/pikascript-api/PikaStdDeivce_GPIO-api.c

Lines changed: 0 additions & 88 deletions
This file was deleted.

‎demo/stm32g070/pikascript/pikascript-api/PikaStdDeivce_GPIO.h

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎demo/stm32g070/pikascript/pikascript-api/PikaStdDeivce_Time-api.c

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎demo/stm32g070/pikascript/pikascript-api/PikaStdDeivce_Time.h

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎demo/stm32g070/pikascript/pikascript-api/PikaStdDevice_GPIO-api.c

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
/* ******************************** */
2+
/* Warning! Don't modify this file! */
3+
/* ******************************** */
4+
#include "PikaStdDevice_GPIO.h"
5+
#include "TinyObj.h"
6+
#include <stdio.h>
7+
#include <stdlib.h>
8+
#include "BaseObj.h"
9+
10+
void PikaStdDevice_GPIO_disableMethod(PikaObj *self, Args *args){
11+
PikaStdDevice_GPIO_disable(self);
12+
}
13+
14+
void PikaStdDevice_GPIO_enableMethod(PikaObj *self, Args *args){
15+
PikaStdDevice_GPIO_enable(self);
16+
}
17+
18+
void PikaStdDevice_GPIO_getModeMethod(PikaObj *self, Args *args){
19+
char * res = PikaStdDevice_GPIO_getMode(self);
20+
method_returnStr(args, res);
21+
}
22+
23+
void PikaStdDevice_GPIO_getPinMethod(PikaObj *self, Args *args){
24+
char * res = PikaStdDevice_GPIO_getPin(self);
25+
method_returnStr(args, res);
26+
}
27+
28+
void PikaStdDevice_GPIO_highMethod(PikaObj *self, Args *args){
29+
PikaStdDevice_GPIO_high(self);
30+
}
31+
32+
void PikaStdDevice_GPIO_initMethod(PikaObj *self, Args *args){
33+
PikaStdDevice_GPIO_init(self);
34+
}
35+
36+
void PikaStdDevice_GPIO_lowMethod(PikaObj *self, Args *args){
37+
PikaStdDevice_GPIO_low(self);
38+
}
39+
40+
void PikaStdDevice_GPIO_platformDisableMethod(PikaObj *self, Args *args){
41+
PikaStdDevice_GPIO_platformDisable(self);
42+
}
43+
44+
void PikaStdDevice_GPIO_platformEnableMethod(PikaObj *self, Args *args){
45+
PikaStdDevice_GPIO_platformEnable(self);
46+
}
47+
48+
void PikaStdDevice_GPIO_platformHighMethod(PikaObj *self, Args *args){
49+
PikaStdDevice_GPIO_platformHigh(self);
50+
}
51+
52+
void PikaStdDevice_GPIO_platformLowMethod(PikaObj *self, Args *args){
53+
PikaStdDevice_GPIO_platformLow(self);
54+
}
55+
56+
void PikaStdDevice_GPIO_platformSetModeMethod(PikaObj *self, Args *args){
57+
char * mode = args_getStr(args, "mode");
58+
PikaStdDevice_GPIO_platformSetMode(self, mode);
59+
}
60+
61+
void PikaStdDevice_GPIO_setModeMethod(PikaObj *self, Args *args){
62+
char * mode = args_getStr(args, "mode");
63+
PikaStdDevice_GPIO_setMode(self, mode);
64+
}
65+
66+
void PikaStdDevice_GPIO_setPinMethod(PikaObj *self, Args *args){
67+
char * pinName = args_getStr(args, "pinName");
68+
PikaStdDevice_GPIO_setPin(self, pinName);
69+
}
70+
71+
PikaObj *New_PikaStdDevice_GPIO(Args *args){
72+
PikaObj *self = New_TinyObj(args);
73+
class_defineMethod(self, "disable()", PikaStdDevice_GPIO_disableMethod);
74+
class_defineMethod(self, "enable()", PikaStdDevice_GPIO_enableMethod);
75+
class_defineMethod(self, "getMode()->str", PikaStdDevice_GPIO_getModeMethod);
76+
class_defineMethod(self, "getPin()->str", PikaStdDevice_GPIO_getPinMethod);
77+
class_defineMethod(self, "high()", PikaStdDevice_GPIO_highMethod);
78+
class_defineMethod(self, "init()", PikaStdDevice_GPIO_initMethod);
79+
class_defineMethod(self, "low()", PikaStdDevice_GPIO_lowMethod);
80+
class_defineMethod(self, "platformDisable()", PikaStdDevice_GPIO_platformDisableMethod);
81+
class_defineMethod(self, "platformEnable()", PikaStdDevice_GPIO_platformEnableMethod);
82+
class_defineMethod(self, "platformHigh()", PikaStdDevice_GPIO_platformHighMethod);
83+
class_defineMethod(self, "platformLow()", PikaStdDevice_GPIO_platformLowMethod);
84+
class_defineMethod(self, "platformSetMode(mode:str)", PikaStdDevice_GPIO_platformSetModeMethod);
85+
class_defineMethod(self, "setMode(mode:str)", PikaStdDevice_GPIO_setModeMethod);
86+
class_defineMethod(self, "setPin(pinName:str)", PikaStdDevice_GPIO_setPinMethod);
87+
return self;
88+
}

‎demo/stm32g070/pikascript/pikascript-api/PikaStdDevice_GPIO.h

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/* ******************************** */
2+
/* Warning! Don't modify this file! */
3+
/* ******************************** */
4+
#ifndef __PikaStdDevice_GPIO__H
5+
#define __PikaStdDevice_GPIO__H
6+
#include <stdio.h>
7+
#include <stdlib.h>
8+
#include "PikaObj.h"
9+
10+
PikaObj *New_PikaStdDevice_GPIO(Args *args);
11+
12+
void PikaStdDevice_GPIO_disable(PikaObj *self);
13+
void PikaStdDevice_GPIO_enable(PikaObj *self);
14+
char * PikaStdDevice_GPIO_getMode(PikaObj *self);
15+
char * PikaStdDevice_GPIO_getPin(PikaObj *self);
16+
void PikaStdDevice_GPIO_high(PikaObj *self);
17+
void PikaStdDevice_GPIO_init(PikaObj *self);
18+
void PikaStdDevice_GPIO_low(PikaObj *self);
19+
void PikaStdDevice_GPIO_platformDisable(PikaObj *self);
20+
void PikaStdDevice_GPIO_platformEnable(PikaObj *self);
21+
void PikaStdDevice_GPIO_platformHigh(PikaObj *self);
22+
void PikaStdDevice_GPIO_platformLow(PikaObj *self);
23+
void PikaStdDevice_GPIO_platformSetMode(PikaObj *self, char * mode);
24+
void PikaStdDevice_GPIO_setMode(PikaObj *self, char * mode);
25+
void PikaStdDevice_GPIO_setPin(PikaObj *self, char * pinName);
26+
27+
#endif

‎demo/stm32g070/pikascript/pikascript-api/PikaStdDevice_Time-api.c

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/* ******************************** */
2+
/* Warning! Don't modify this file! */
3+
/* ******************************** */
4+
#include "PikaStdDevice_Time.h"
5+
#include "TinyObj.h"
6+
#include <stdio.h>
7+
#include <stdlib.h>
8+
#include "BaseObj.h"
9+
10+
void PikaStdDevice_Time_sleep_msMethod(PikaObj *self, Args *args){
11+
int ms = args_getInt(args, "ms");
12+
PikaStdDevice_Time_sleep_ms(self, ms);
13+
}
14+
15+
void PikaStdDevice_Time_sleep_sMethod(PikaObj *self, Args *args){
16+
int s = args_getInt(args, "s");
17+
PikaStdDevice_Time_sleep_s(self, s);
18+
}
19+
20+
PikaObj *New_PikaStdDevice_Time(Args *args){
21+
PikaObj *self = New_TinyObj(args);
22+
class_defineMethod(self, "sleep_ms(ms:int)", PikaStdDevice_Time_sleep_msMethod);
23+
class_defineMethod(self, "sleep_s(s:int)", PikaStdDevice_Time_sleep_sMethod);
24+
return self;
25+
}

0 commit comments

Comments
 (0)