Skip to content

Commit caf8211

Browse files
committed
Merge branch 'master' of https://github.com/mimilib/pikascript into master
2 parents 01ce4ec + f1d90fd commit caf8211

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

src/package/pikascript/main.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import PikaStdLib
2+
import PikaStdDevice
23
from PikaObj import *
34

45
print('hello world')
56
mem = PikaStdLib.MemChecker()
67
print('mem.max :')
78
mem.max()
89
print('mem.now :')
9-
mem.now()
10+
mem.now()

src/package/pikascript/pikascript-lib/PikaStdDevice/PikaStdDeivce_GPIO.c renamed to src/package/pikascript/pikascript-lib/PikaStdDevice/PikaStdDevice_GPIO.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "BaseObj.h"
2-
#include "PikaStdDeivce_GPIO.h"
2+
#include "PikaStdDevice_GPIO.h"
33

44
void PikaStdDeivce_GPIO_init(PikaObj *self)
55
{

src/package/pikascript/pikascript-lib/PikaStdDevice/PikaStdDevice_Time.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "BaseObj.h"
2-
#include "PikaStdDeivce_Time.h"
2+
#include "PikaStdDevice_Time.h"
33

44
void PikaStdDeivce_Time_sleep_ms(PikaObj *self, int ms)
55
{

0 commit comments

Comments
 (0)