Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
micropython
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
card10
micropython
Commits
40048ada
Commit
40048ada
authored
11 years ago
by
mux
Browse files
Options
Downloads
Patches
Plain Diff
Move file obj to separate module
parent
2b2cb7b7
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
stm/Makefile
+1
-0
1 addition, 0 deletions
stm/Makefile
stm/file.c
+94
-0
94 additions, 0 deletions
stm/file.c
stm/file.h
+1
-0
1 addition, 0 deletions
stm/file.h
stm/main.c
+1
-84
1 addition, 84 deletions
stm/main.c
with
97 additions
and
84 deletions
stm/Makefile
+
1
−
0
View file @
40048ada
...
...
@@ -65,6 +65,7 @@ SRC_C = \
usrsw.c
\
adc.c
\
rtc.c
\
file.c
\
# pybwlan.c
\
SRC_S
=
\
...
...
This diff is collapsed.
Click to expand it.
stm/file.c
0 → 100644
+
94
−
0
View file @
40048ada
#include
<stdio.h>
#include
<stm32f4xx.h>
#include
"misc.h"
#include
"mpconfig.h"
#include
"mpconfigport.h"
#include
"qstr.h"
#include
"obj.h"
#include
"file.h"
#include
"ff.h"
typedef
struct
_pyb_file_obj_t
{
mp_obj_base_t
base
;
FIL
fp
;
}
pyb_file_obj_t
;
void
file_obj_print
(
void
(
*
print
)(
void
*
env
,
const
char
*
fmt
,
...),
void
*
env
,
mp_obj_t
self_in
,
mp_print_kind_t
kind
)
{
printf
(
"<file %p>"
,
self_in
);
}
mp_obj_t
file_obj_read
(
mp_obj_t
self_in
,
mp_obj_t
arg
)
{
pyb_file_obj_t
*
self
=
self_in
;
int
n
=
mp_obj_get_int
(
arg
);
byte
*
buf
=
m_new
(
byte
,
n
);
UINT
n_out
;
f_read
(
&
self
->
fp
,
buf
,
n
,
&
n_out
);
return
mp_obj_new_str
(
buf
,
n_out
,
false
);
}
mp_obj_t
file_obj_write
(
mp_obj_t
self_in
,
mp_obj_t
arg
)
{
pyb_file_obj_t
*
self
=
self_in
;
uint
l
;
const
byte
*
s
=
mp_obj_str_get_data
(
arg
,
&
l
);
UINT
n_out
;
FRESULT
res
=
f_write
(
&
self
->
fp
,
s
,
l
,
&
n_out
);
if
(
res
!=
FR_OK
)
{
printf
(
"File error: could not write to file; error code %d
\n
"
,
res
);
}
else
if
(
n_out
!=
l
)
{
printf
(
"File error: could not write all data to file; wrote %d / %d bytes
\n
"
,
n_out
,
l
);
}
return
mp_const_none
;
}
mp_obj_t
file_obj_close
(
mp_obj_t
self_in
)
{
pyb_file_obj_t
*
self
=
self_in
;
f_close
(
&
self
->
fp
);
return
mp_const_none
;
}
static
MP_DEFINE_CONST_FUN_OBJ_2
(
file_obj_read_obj
,
file_obj_read
);
static
MP_DEFINE_CONST_FUN_OBJ_2
(
file_obj_write_obj
,
file_obj_write
);
static
MP_DEFINE_CONST_FUN_OBJ_1
(
file_obj_close_obj
,
file_obj_close
);
// TODO gc hook to close the file if not already closed
static
const
mp_method_t
file_methods
[]
=
{
{
"read"
,
&
file_obj_read_obj
},
{
"write"
,
&
file_obj_write_obj
},
{
"close"
,
&
file_obj_close_obj
},
{
NULL
,
NULL
},
};
static
const
mp_obj_type_t
file_obj_type
=
{
{
&
mp_const_type
},
"File"
,
.
print
=
file_obj_print
,
.
methods
=
file_methods
,
};
mp_obj_t
pyb_io_open
(
mp_obj_t
o_filename
,
mp_obj_t
o_mode
)
{
const
char
*
filename
=
mp_obj_str_get_str
(
o_filename
);
const
char
*
mode
=
mp_obj_str_get_str
(
o_mode
);
pyb_file_obj_t
*
self
=
m_new_obj
(
pyb_file_obj_t
);
self
->
base
.
type
=
&
file_obj_type
;
if
(
mode
[
0
]
==
'r'
)
{
// open for reading
FRESULT
res
=
f_open
(
&
self
->
fp
,
filename
,
FA_READ
);
if
(
res
!=
FR_OK
)
{
printf
(
"FileNotFoundError: [Errno 2] No such file or directory: '%s'
\n
"
,
filename
);
return
mp_const_none
;
}
}
else
if
(
mode
[
0
]
==
'w'
)
{
// open for writing, truncate the file first
FRESULT
res
=
f_open
(
&
self
->
fp
,
filename
,
FA_WRITE
|
FA_CREATE_ALWAYS
);
if
(
res
!=
FR_OK
)
{
printf
(
"?FileError: could not create file: '%s'
\n
"
,
filename
);
return
mp_const_none
;
}
}
else
{
printf
(
"ValueError: invalid mode: '%s'
\n
"
,
mode
);
return
mp_const_none
;
}
return
self
;
}
This diff is collapsed.
Click to expand it.
stm/file.h
0 → 100644
+
1
−
0
View file @
40048ada
mp_obj_t
pyb_io_open
(
mp_obj_t
o_filename
,
mp_obj_t
o_mode
);
This diff is collapsed.
Click to expand it.
stm/main.c
+
1
−
84
View file @
40048ada
...
...
@@ -43,6 +43,7 @@
#include
"usrsw.h"
#include
"adc.h"
#include
"rtc.h"
#include
"file.h"
int
errno
;
...
...
@@ -544,90 +545,6 @@ mp_obj_t pyb_hid_send_report(mp_obj_t arg) {
return
mp_const_none
;
}
typedef
struct
_pyb_file_obj_t
{
mp_obj_base_t
base
;
FIL
fp
;
}
pyb_file_obj_t
;
void
file_obj_print
(
void
(
*
print
)(
void
*
env
,
const
char
*
fmt
,
...),
void
*
env
,
mp_obj_t
self_in
,
mp_print_kind_t
kind
)
{
printf
(
"<file %p>"
,
self_in
);
}
mp_obj_t
file_obj_read
(
mp_obj_t
self_in
,
mp_obj_t
arg
)
{
pyb_file_obj_t
*
self
=
self_in
;
int
n
=
mp_obj_get_int
(
arg
);
byte
*
buf
=
m_new
(
byte
,
n
);
UINT
n_out
;
f_read
(
&
self
->
fp
,
buf
,
n
,
&
n_out
);
return
mp_obj_new_str
(
buf
,
n_out
,
false
);
}
mp_obj_t
file_obj_write
(
mp_obj_t
self_in
,
mp_obj_t
arg
)
{
pyb_file_obj_t
*
self
=
self_in
;
uint
l
;
const
byte
*
s
=
mp_obj_str_get_data
(
arg
,
&
l
);
UINT
n_out
;
FRESULT
res
=
f_write
(
&
self
->
fp
,
s
,
l
,
&
n_out
);
if
(
res
!=
FR_OK
)
{
printf
(
"File error: could not write to file; error code %d
\n
"
,
res
);
}
else
if
(
n_out
!=
l
)
{
printf
(
"File error: could not write all data to file; wrote %d / %d bytes
\n
"
,
n_out
,
l
);
}
return
mp_const_none
;
}
mp_obj_t
file_obj_close
(
mp_obj_t
self_in
)
{
pyb_file_obj_t
*
self
=
self_in
;
f_close
(
&
self
->
fp
);
return
mp_const_none
;
}
static
MP_DEFINE_CONST_FUN_OBJ_2
(
file_obj_read_obj
,
file_obj_read
);
static
MP_DEFINE_CONST_FUN_OBJ_2
(
file_obj_write_obj
,
file_obj_write
);
static
MP_DEFINE_CONST_FUN_OBJ_1
(
file_obj_close_obj
,
file_obj_close
);
// TODO gc hook to close the file if not already closed
static
const
mp_method_t
file_methods
[]
=
{
{
"read"
,
&
file_obj_read_obj
},
{
"write"
,
&
file_obj_write_obj
},
{
"close"
,
&
file_obj_close_obj
},
{
NULL
,
NULL
},
};
static
const
mp_obj_type_t
file_obj_type
=
{
{
&
mp_const_type
},
"File"
,
.
print
=
file_obj_print
,
.
methods
=
file_methods
,
};
mp_obj_t
pyb_io_open
(
mp_obj_t
o_filename
,
mp_obj_t
o_mode
)
{
const
char
*
filename
=
mp_obj_str_get_str
(
o_filename
);
const
char
*
mode
=
mp_obj_str_get_str
(
o_mode
);
pyb_file_obj_t
*
self
=
m_new_obj
(
pyb_file_obj_t
);
self
->
base
.
type
=
&
file_obj_type
;
if
(
mode
[
0
]
==
'r'
)
{
// open for reading
FRESULT
res
=
f_open
(
&
self
->
fp
,
filename
,
FA_READ
);
if
(
res
!=
FR_OK
)
{
printf
(
"FileNotFoundError: [Errno 2] No such file or directory: '%s'
\n
"
,
filename
);
return
mp_const_none
;
}
}
else
if
(
mode
[
0
]
==
'w'
)
{
// open for writing, truncate the file first
FRESULT
res
=
f_open
(
&
self
->
fp
,
filename
,
FA_WRITE
|
FA_CREATE_ALWAYS
);
if
(
res
!=
FR_OK
)
{
printf
(
"?FileError: could not create file: '%s'
\n
"
,
filename
);
return
mp_const_none
;
}
}
else
{
printf
(
"ValueError: invalid mode: '%s'
\n
"
,
mode
);
return
mp_const_none
;
}
return
self
;
}
mp_obj_t
pyb_rng_get
(
void
)
{
return
mp_obj_new_int
(
RNG_GetRandomNumber
()
>>
16
);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment