summaryrefslogtreecommitdiffstatshomepage
path: root/stm
diff options
context:
space:
mode:
Diffstat (limited to 'stm')
-rw-r--r--stm/Makefile56
-rw-r--r--stm/file.c94
-rw-r--r--stm/file.h1
-rw-r--r--stm/main.c85
4 files changed, 109 insertions, 127 deletions
diff --git a/stm/Makefile b/stm/Makefile
index ab69109583..b3483e089d 100644
--- a/stm/Makefile
+++ b/stm/Makefile
@@ -1,5 +1,4 @@
-# define main target
-all: all2
+include ../py/mkenv.mk
# qstr definitions (must come before including py.mk)
QSTR_DEFS = qstrdefsport.h
@@ -7,10 +6,6 @@ QSTR_DEFS = qstrdefsport.h
# include py core make definitions
include ../py/py.mk
-# program for deletion
-RM = /bin/rm
-ECHO = @echo
-
CMSIS=cmsis
STMSRC=lib
#STMOTGSRC=usbhost
@@ -18,11 +13,7 @@ FATFSSRC=fatfs
CC3KSRC=cc3k
DFU=../tools/dfu.py
-AS = arm-none-eabi-as
-CC = arm-none-eabi-gcc
-LD = arm-none-eabi-ld
-OBJCOPY = arm-none-eabi-objcopy
-SIZE = arm-none-eabi-size
+CROSS_COMPILE = arm-none-eabi-
CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mabi=aapcs-linux -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -fsingle-precision-constant -Wdouble-promotion
CFLAGS = -I. -I$(PY_SRC) -I$(FATFSSRC) -I$(CMSIS) -I$(STMSRC) -Wall -ansi -std=gnu99 $(CFLAGS_CORTEX_M4)
@@ -65,17 +56,19 @@ SRC_C = \
usrsw.c \
adc.c \
rtc.c \
+ file.c \
# pybwlan.c \
SRC_S = \
startup_stm32f40xx.s \
gchelper.s \
-SRC_FATFS = \
+SRC_FATFS = $(addprefix $(FATFSSRC)/,\
ff.c \
diskio.c \
+ )
-SRC_STM = \
+SRC_STM = $(addprefix $(STMSRC)/,\
stm32f4xx_rcc.c \
stm32f4xx_syscfg.c \
stm_misc.c \
@@ -111,8 +104,9 @@ SRC_STM = \
usbd_msc_data.c \
usbd_msc_scsi.c \
usbd_storage_msd.c \
+ )
-#SRC_STM_OTG = \
+#SRC_STM_OTG = $(addprefix $(STMSRC)/,\
usb_hcd.c \
usb_hcd_int.c \
usbh_core.c \
@@ -124,8 +118,9 @@ SRC_STM = \
usbh_hid_mouse.c \
usbh_hid_keybd.c \
# usb_otg.c \
+ )
-SRC_CC3K = \
+SRC_CC3K = $(addprefix $(CC3KSRC)/,\
cc3000_common.c \
evnt_handler.c \
hci.c \
@@ -136,11 +131,12 @@ SRC_CC3K = \
wlan.c \
ccspi.c \
pybcc3k.c \
+ )
OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o) $(SRC_S:.s=.o) $(SRC_FATFS:.c=.o) $(SRC_STM:.c=.o)) # $(SRC_CC3K:.c=.o))
#OBJ += $(addprefix $(BUILD)/, $(SRC_STM_OTG:.c=.o))
-all2: $(BUILD) $(BUILD)/flash.dfu
+all: $(BUILD) $(BUILD)/flash.dfu
$(BUILD)/flash.dfu: $(BUILD)/flash0.bin $(BUILD)/flash1.bin
$(ECHO) "Create $@"
@@ -157,31 +153,5 @@ $(BUILD)/flash.elf: $(OBJ)
$(Q)$(LD) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
$(Q)$(SIZE) $@
-$(BUILD)/%.o: %.s
- $(ECHO) "AS $<"
- $(Q)$(AS) -o $@ $<
-
-$(BUILD)/%.o: %.c $(QSTR_DEFS)
- $(ECHO) "CC $<"
- $(Q)$(CC) $(CFLAGS) -c -o $@ $<
-
-$(BUILD)/%.o: $(FATFSSRC)/%.c
- $(ECHO) "CC $<"
- $(Q)$(CC) $(CFLAGS) -c -o $@ $<
-
-$(BUILD)/%.o: $(STMSRC)/%.c
- $(ECHO) "CC $<"
- $(Q)$(CC) $(CFLAGS) -c -o $@ $<
-
-#$(BUILD)/%.o: $(STMOTGSRC)/%.c
-# $(ECHO) "CC $<"
-# $(Q)$(CC) $(CFLAGS) -c -o $@ $<
-
-$(BUILD)/%.o: $(CC3KSRC)/%.c
- $(ECHO) "CC $<"
- $(Q)$(CC) $(CFLAGS) -c -o $@ $<
-
-clean:
- $(RM) -rf $(BUILD)
+include ../py/mkrules.mk
-.PHONY: all all2 clean
diff --git a/stm/file.c b/stm/file.c
new file mode 100644
index 0000000000..35bfca16a5
--- /dev/null
+++ b/stm/file.c
@@ -0,0 +1,94 @@
+#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;
+}
diff --git a/stm/file.h b/stm/file.h
new file mode 100644
index 0000000000..3845635deb
--- /dev/null
+++ b/stm/file.h
@@ -0,0 +1 @@
+mp_obj_t pyb_io_open(mp_obj_t o_filename, mp_obj_t o_mode);
diff --git a/stm/main.c b/stm/main.c
index 92c3772d5f..2ce2b6dc61 100644
--- a/stm/main.c
+++ b/stm/main.c
@@ -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);
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-04 22:10:13 +0000