Skip to content

Commit f034821

Browse files
pikasTechpikasTech
committed
release pkgs
1 parent c762182 commit f034821

33 files changed

+1535
-1237
lines changed

‎examples/flashdb/flashdb_utest.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
kvdb=None
66
fdb=flashdb.FDB()
77

8+
DB_PATH = "test/out/fdb_kvdb"
9+
810
class FlashDBUnitTest(unittest.TestCase):
911
def test_boot_count1(self):
1012
print('test boot_count increment 1')
@@ -22,7 +24,8 @@ def test_boot_count1(self):
2224
'boot_time': boot_time_blob, # array type kv
2325
}
2426
#print(default_kv)
25-
kvdb = fdb.kvdb_init("env", "fdb_kvdb", default_kv, None)
27+
kvdb = fdb.kvdb_init("env", DB_PATH, default_kv, None)
28+
return
2629

2730
res = fdb.kv_get_blob(kvdb, "boot_count", len(boot_count_blob))
2831
self.assertIsNotNone(res)
@@ -39,7 +42,7 @@ def test_boot_count1(self):
3942

4043
self.assertEqual(new_boot_count, boot_count)
4144

42-
def test_boot_count2(self):
45+
def xtest_boot_count2(self):
4346
print('test boot_count increment 2')
4447
if fdb is None:
4548
fdb = flashdb.FDB()
@@ -60,7 +63,7 @@ def test_boot_count2(self):
6063
'boot_time': boot_time_blob, # array type kv
6164
}
6265
#print(default_kv)
63-
kvdb = fdb.kvdb_init("env", "fdb_kvdb", default_kv, None)
66+
kvdb = fdb.kvdb_init("env", DB_PATH, default_kv, None)
6467

6568
boot_count = fdb.kv_get_by_fmt(kvdb, "boot_count", boot_count_size, boot_count_fmt)
6669
self.assertIsNotNone(boot_count)

‎package/PikaCV/PikaCV_Image.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ void PikaCV_Image_read(PikaObj* self, char* path) {
137137
PikaCV_Image_loadJpeg(self, data_arg);
138138
} else {
139139
obj_setErrorCode(self, PIKA_RES_ERR_OPERATION_FAILED);
140-
__platform_printf("PikaCV_Image_read: unsupported format: %s\n",
141-
suffix);
140+
obj_setSysOut(self, "PikaCV_Image_read: unsupported format: %s",
141+
suffix);
142142
}
143143
arg_deinit(data_arg);
144144
strsDeinit(&buffs);
@@ -162,8 +162,8 @@ void PikaCV_Image_setPixel(PikaObj* self,
162162
data[y * image->width + x] = value;
163163
} else {
164164
obj_setErrorCode(self, PIKA_RES_ERR_OPERATION_FAILED);
165-
__platform_printf("PikaCV_Image_setPixel: unsupported format: %d\n",
166-
image->format);
165+
obj_setSysOut(self, "PikaCV_Image_setPixel: unsupported format: %d",
166+
image->format);
167167
}
168168
}
169169

@@ -181,8 +181,8 @@ int PikaCV_Image_getPixel(PikaObj* self, int channel, int x, int y) {
181181
return data[y * image->width + x];
182182
} else {
183183
obj_setErrorCode(self, PIKA_RES_ERR_OPERATION_FAILED);
184-
__platform_printf("PikaCV_Image_getPixel: unsupported format: %d\n",
185-
image->format);
184+
obj_setSysOut(self, "PikaCV_Image_getPixel: unsupported format: %d",
185+
image->format);
186186
}
187187
return 0;
188188
}
@@ -208,14 +208,14 @@ void PikaCV_Image_write(PikaObj* self, char* path) {
208208
int size = _image_getDataSize(self);
209209
if (NULL == data || size <= 0) {
210210
obj_setErrorCode(self, PIKA_RES_ERR_OPERATION_FAILED);
211-
__platform_printf("PikaCV_Image_write: data is NULL or size is 0\n");
211+
obj_setSysOut(self, "PikaCV_Image_write: data is NULL or size is 0");
212212
return;
213213
}
214214
FILE* fp = __platform_fopen(path, "wb+");
215215
if (NULL == fp) {
216216
obj_setErrorCode(self, PIKA_RES_ERR_OPERATION_FAILED);
217-
__platform_printf("PikaCV_Image_write: failed to open file: %s\n",
218-
path);
217+
obj_setSysOut(self, "PikaCV_Image_write: failed to open file: %s",
218+
path);
219219
return;
220220
}
221221
__platform_fwrite(data, 1, size, fp);
@@ -234,12 +234,12 @@ void PikaCV_Image_add(PikaObj* self, PikaObj* image) {
234234
}
235235
if (!PikaCV_Format_CheckTwo(self, image, PikaCV_Check_ReturnError)) {
236236
obj_setErrorCode(self, PIKA_RES_ERR_OPERATION_FAILED);
237-
__platform_printf("unsupported image format\n");
237+
obj_setSysOut(self, "unsupported image format");
238238
return;
239239
}
240240
if (!PikaCV_Size_Check(self, image, PikaCV_Check_SHW)) {
241241
obj_setErrorCode(self, PIKA_RES_ERR_OPERATION_FAILED);
242-
__platform_printf("illegal image size\n");
242+
obj_setSysOut(self, "illegal image size");
243243
return;
244244
}
245245

@@ -278,12 +278,12 @@ void PikaCV_Image_minus(PikaObj* self, PikaObj* image) {
278278
}
279279
if (!PikaCV_Format_CheckTwo(self, image, PikaCV_Check_ReturnError)) {
280280
obj_setErrorCode(self, PIKA_RES_ERR_OPERATION_FAILED);
281-
__platform_printf("unsupported image format\n");
281+
obj_setSysOut(self, "unsupported image format");
282282
return;
283283
}
284284
if (!PikaCV_Size_Check(self, image, PikaCV_Check_SHW)) {
285285
obj_setErrorCode(self, PIKA_RES_ERR_OPERATION_FAILED);
286-
__platform_printf("illegal image size\n");
286+
obj_setSysOut(self, "illegal image size");
287287
return;
288288
}
289289

@@ -327,7 +327,7 @@ void PikaCV_Image_merge(PikaObj* self, PikaObj* B, PikaObj* G, PikaObj* R) {
327327
if (!PikaCV_Format_Check(self, PikaCV_ImageFormat_Type_RGB888,
328328
PikaCV_Check_ReturnError)) {
329329
obj_setErrorCode(self, PIKA_RES_ERR_OPERATION_FAILED);
330-
__platform_printf("unsupported image format\n");
330+
obj_setSysOut(self, "unsupported image format");
331331
return;
332332
}
333333
if (!PikaCV_Format_Check(B, PikaCV_ImageFormat_Type_GRAY,
@@ -337,13 +337,13 @@ void PikaCV_Image_merge(PikaObj* self, PikaObj* B, PikaObj* G, PikaObj* R) {
337337
!PikaCV_Format_Check(R, PikaCV_ImageFormat_Type_GRAY,
338338
PikaCV_Check_ReturnError)) {
339339
obj_setErrorCode(self, PIKA_RES_ERR_OPERATION_FAILED);
340-
__platform_printf("unsupported image format\n");
340+
obj_setSysOut(self, "unsupported image format");
341341
return;
342342
}
343343
if (!PikaCV_Size_Check(B, G, PikaCV_Check_SHW) ||
344344
!PikaCV_Size_Check(B, R, PikaCV_Check_SHW)) {
345345
obj_setErrorCode(self, PIKA_RES_ERR_OPERATION_FAILED);
346-
__platform_printf("illegal image size\n");
346+
obj_setSysOut(self, "illegal image size");
347347
return;
348348
}
349349

@@ -378,7 +378,7 @@ PikaObj* PikaCV_Image_split(PikaObj* self) {
378378
if (!PikaCV_Format_Check(self, PikaCV_ImageFormat_Type_RGB888,
379379
PikaCV_Check_ReturnError)) {
380380
obj_setErrorCode(self, PIKA_RES_ERR_OPERATION_FAILED);
381-
__platform_printf("unsupported image format\n");
381+
obj_setSysOut(self, "unsupported image format");
382382
return NULL;
383383
}
384384

‎package/PikaCV/PikaCV_Transforms.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ void PikaCV_Transforms_rotateDown(PikaObj* self, PikaObj* image) {
1313
if ((img->format != PikaCV_ImageFormat_Type_BGR888) &&
1414
(img->format != PikaCV_ImageFormat_Type_RGB888)) {
1515
obj_setErrorCode(self, PIKA_RES_ERR_OPERATION_FAILED);
16-
__platform_printf("unsupported image format\n");
16+
obj_setSysOut(self, "unsupported image format");
1717
return;
1818
}
1919
int width = img->width;

‎package/PikaStdDevice/pika_hal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ int pika_hal_SG_ioctl_merge_config(pika_hal_SG_config* dst,
341341
_IOCTL_CONFIG_USE_DEFAULT(amplitude, 0.1);
342342
dst->offset = src->offset;
343343
dst->seconds = src->seconds;
344-
_IOCTL_CONFIG_USE_DEFAULT(noblocking, PIKA_HAL_SG_NOBLOCKING_ENABLE);
344+
_IOCTL_CONFIG_USE_DEFAULT(noblocking, PIKA_HAL_SG_NOBLOCKING_ENABLE);
345345
_IOCTL_CONFIG_USE_DEFAULT(event_callback, NULL);
346346
_IOCTL_CONFIG_USE_DEFAULT(event_callback_filter,
347347
PIKA_HAL_SG_EVENT_SIGNAL_ANY);

‎package/PikaStdDevice/pika_hal.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -594,9 +594,9 @@ typedef enum {
594594
} PIKA_HAL_SG_EVENT_SIGNAL;
595595

596596
typedef enum {
597-
_PIKA_HAL_SG_NOBLOCKING_UNUSED = 0,
598-
PIKA_HAL_SG_NOBLOCKING_ENABLE,
599-
PIKA_HAL_SG_NOBLOCKING_DISABLE,
597+
_PIKA_HAL_SG_NOBLOCKING_UNUSED = 0,
598+
PIKA_HAL_SG_NOBLOCKING_ENABLE,
599+
PIKA_HAL_SG_NOBLOCKING_DISABLE,
600600
} PIKA_HAL_SG_NOBLOCKING;
601601

602602
typedef struct {
@@ -605,7 +605,7 @@ typedef struct {
605605
pika_float amplitude; // Amplitude in Volts
606606
pika_float offset; // Offset in Volts
607607
pika_float seconds; // Seconds to output
608-
PIKA_HAL_SG_NOBLOCKING noblocking;
608+
PIKA_HAL_SG_NOBLOCKING noblocking;
609609
void (*event_callback)(pika_dev* dev, PIKA_HAL_SG_EVENT_SIGNAL signal);
610610
PIKA_HAL_SG_EVENT_SIGNAL event_callback_filter;
611611
PIKA_HAL_EVENT_CALLBACK_ENA event_callback_ena;

‎package/aes/_aes_AES.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Arg* _aes_AES_encrypt(PikaObj* self, Arg* msg) {
8888
buff);
8989
break;
9090
default:
91-
__platform_printf("[%s]not support mode\r\n", __FUNCTION__);
91+
obj_setSysOut(self, "[%s]not support mode", __FUNCTION__);
9292
obj_setErrorCode(self, -3); // not support now
9393
break;
9494
}
@@ -141,7 +141,7 @@ Arg* _aes_AES_decrypt(PikaObj* self, Arg* msg) {
141141
buff);
142142
break;
143143
default:
144-
__platform_printf("[%s]not support mode\r\n", __FUNCTION__);
144+
obj_setSysOut(self, "[%s]not support mode", __FUNCTION__);
145145
obj_setErrorCode(self, -3); // not support now
146146
break;
147147
}

‎package/binascii/binascii.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ Arg* binascii_a2b_hex(PikaObj* self, char* val) {
1919
int hex_val = hex2int(val[i]);
2020
if (hex_val == -1) {
2121
obj_setErrorCode(self, PIKA_RES_ERR_RUNTIME_ERROR);
22-
pika_platform_printf(
23-
"TypeError: non-hexadecimal number found in "
24-
"fromhex() arg at position %d\r\n",
25-
i + 1);
22+
obj_setSysOut(self,
23+
"TypeError: non-hexadecimal number found in "
24+
"fromhex() arg at position %d",
25+
i + 1);
2626
} else {
2727
res_hex[i / 2] = (hex_val << 4) | hex2int(val[i + 1]);
2828
}
@@ -34,7 +34,7 @@ Arg* binascii_b2a_hex(PikaObj* self, Arg* val) {
3434
/* assert val is bytes */
3535
if (arg_getType(val) != ARG_TYPE_BYTES) {
3636
obj_setErrorCode(self, PIKA_RES_ERR_RUNTIME_ERROR);
37-
__platform_printf("TypeError: cannot convert value to bytes\r\n");
37+
obj_setSysOut(self, "TypeError: cannot convert value to bytes");
3838
return arg_newNone();
3939
}
4040

‎package/flashdb/_flashdb.pyi

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,6 @@ class FlashDB:
4545
# def kv_iterator_init(kvdb:any, itr:any)->any:...
4646

4747
# def kv_iterate(kvdb:any, itr:any)->any:...
48+
49+
def __del__(self): ...
50+

‎package/flashdb/_flashdb_FlashDB.c

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
#include "flashdb.h"
1414
#define FDB_LOG_TAG "[main]"
1515

16+
#define _FDBBUFFS (Args*)obj_getPtr(self, "FDBBUFFS")
17+
#define strdup(x) strsCopy(_FDBBUFFS, x)
18+
1619
bool g_kvdb_path_inited = false;
1720

1821
/* TSDB object */
@@ -47,7 +50,10 @@ typedef struct fdb_kvdb FDB_KVDB;
4750
typedef struct fdb_default_kv_node FDB_DEFAULT_KV_NODE;
4851
int g_def_kv_table_idx;
4952

50-
void _flashdb_FlashDB___init__(PikaObj* self) {}
53+
void _flashdb_FlashDB___init__(PikaObj* self) {
54+
Args* buffs = New_strBuff();
55+
obj_setPtr(self, "FDBBUFFS", buffs);
56+
}
5157

5258
/*
5359
Arg* _flashdb_FlashDB_blob_make(PikaObj *self, Arg* blob, Arg* value_buf, int
@@ -150,15 +156,21 @@ int _flashdb_FlashDB_kvdb_control(PikaObj* self, Arg* kvdb, int cmd, Arg* arg) {
150156
}
151157

152158
void _flashdb_FlashDB_kvdb_deinit(PikaObj* self, Arg* kvdb) {}
153-
154-
int32_t _flashdb_foreach(PikaObj* self,
159+
struct _flashdb_foreach_context {
160+
struct fdb_default_kv_node* def_kv_table;
161+
PikaObj* self;
162+
};
163+
int32_t _flashdb_foreach(PikaObj* self_dict,
155164
Arg* keyEach,
156165
Arg* valEach,
157166
void* context) {
158167
char* key = arg_getStr(keyEach);
159168
ArgType argt_val = arg_getType(valEach);
160-
struct fdb_default_kv_node* def_kv_table =
161-
(struct fdb_default_kv_node*)context;
169+
struct _flashdb_foreach_context* foreach_context =
170+
(struct _flashdb_foreach_context*)context;
171+
struct fdb_default_kv_node* def_kv_table = foreach_context->def_kv_table;
172+
PikaObj* self = foreach_context->self;
173+
162174
if (argt_val == ARG_TYPE_STRING) {
163175
char* val = arg_getStr(valEach);
164176

@@ -170,7 +182,8 @@ int32_t _flashdb_foreach(PikaObj* self,
170182
} else if (argt_val == ARG_TYPE_BYTES) {
171183
size_t bytes_size = arg_getBytesSize(valEach);
172184
uint8_t* bytes = arg_getBytes(valEach);
173-
uint8_t* pbytes = (uint8_t*)malloc(bytes_size * sizeof(uint8_t));
185+
uint8_t* pbytes =
186+
(uint8_t*)args_getBuff(_FDBBUFFS, bytes_size * sizeof(uint8_t));
174187
memcpy(pbytes, bytes, bytes_size);
175188
/*
176189
for (size_t i=0; i < bytes_size; i++) {
@@ -209,10 +222,15 @@ PikaObj* _flashdb_FlashDB_kvdb_init(PikaObj* self,
209222
// int len =pikaDict_getSize(default_kv_in);
210223

211224
struct fdb_default_kv_node* def_kv_table =
212-
(struct fdb_default_kv_node*)malloc(4 *
213-
sizeof(struct fdb_default_kv_node));
225+
(struct fdb_default_kv_node*)args_getBuff(
226+
_FDBBUFFS, (4 * sizeof(struct fdb_default_kv_node)));
214227
g_def_kv_table_idx = 0;
215-
pikaDict_forEach(default_kv_in, _flashdb_foreach, def_kv_table);
228+
229+
struct _flashdb_foreach_context context = {
230+
.def_kv_table = def_kv_table,
231+
.self = self,
232+
};
233+
pikaDict_forEach(default_kv_in, _flashdb_foreach, &context);
216234

217235
struct fdb_default_kv default_kv;
218236

@@ -232,3 +250,9 @@ PikaObj* _flashdb_FlashDB_kvdb_init(PikaObj* self,
232250
obj_setPtr(kvdb_obj, "kvdb", pkvdb);
233251
return kvdb_obj;
234252
}
253+
254+
void _flashdb_FlashDB___del__(PikaObj* self) {
255+
args_deinit(_FDBBUFFS);
256+
}
257+
258+
#undef strudp

0 commit comments

Comments
 (0)