mirror of
https://github.com/openshwprojects/OpenBK7231T_App.git
synced 2026-02-04 19:25:47 +00:00
* setChannel(ch, v) in Berry
* try
* t2
* b
* fx
* update to berry with autogenerated files
* Add debug to find out whether the submodule is really checked out
* Revert "Add debug to find out whether the submodule is really checked out"
This reverts commit 40ec2f6677.
* Add src/berry checkout to every build
* berry separate file p1
* #define ENABLE_OBK_BERRY 1 on Beken only
* Compile in obkSimulator
Compiles, but crashes in parser.
Seems like the Berry code has not been tested under MSVC2017.
* Checkout with submodules in obkSimulator workflow
* berry with ffs msvc fix
* berry autogen fiasco fix
* OpenBK7231T compiles from official berry, handle prebuild
Breaks obkSimulator
* Fix botched rebase on .gitmodules
* Build in msvc with a berry prebuild step (requires python)
* MSVC: also extend include directories for Release
* Fix BK723x build, extract common berry build rules into berry.mk
* Fix OpenBL602 build
This doesn't actually compile berry for OpenBL602, but makes compile
errors go away and marks where further work will be needed.
* working delayMs
Test Plan:
```
berry state = 1; var tick; def tick() state = 1 - state; channelSet(1, state); delayMs(1000, tick); end; tick();
```
can be stopped with `stopAllScripts`
* only use os_realloc on PLATFORM_BK7231T
* Move as much berry logic as possible out of cmd_script
* Guard more with ENABLE_OBK_BERRY
* upload script
* file operations & working import
* enough to implement "Advanced turn off after time with timer on UI and timer setting on UI and kept in flash"
* experiments
* clang-format -i src/berry/be_*.{h,c} src/cmnds/cmd_berry.c
* Remove redundant hfile != NULL
Calling with hfile == NULL would be bug in some other part of the code
* Don't checkout other submodules for simulator build
* remove stray debug & .user files
* Use be_newcomobj
* Build sim on linux
* build linux sim [2]
* threads & tests
* Leave enabled on Windows, disable on BEKEN
* SIM_RunWindow fix?
* allow "startScript test.be" as a shorthand for "berry import test" ??
* test?
* fix /
* test arg
* test2
* test
* test add
* fx
* test
* just checking if i can use import without module?
* test with module
* CMD_StopBerry fix?
* run obk command from berry? probably not good idea due to the stack size, will delay execution later?
* str arg
* test to see if i have to repeat import
* submit unfinished code
* concat tst
* more tests
* fix copy/paste mistake, add fib test
* fx
* channelSet
* fx
* try
* tester.fib(11)
* rename
---------
Co-authored-by: Tester23 <85486843+openshwprojects@users.noreply.github.com>
Co-authored-by: NonPIayerCharacter <18557343+NonPIayerCharacter@users.noreply.github.com>
65 lines
1.9 KiB
Makefile
65 lines
1.9 KiB
Makefile
TARGET_EXEC ?= win_main
|
|
|
|
BUILD_DIR ?= build
|
|
#SRC_DIRS ?= src/ src/bitmessage src/cJSON src/cmnds src/devicegroups src/driver src/hal/win32 src/httpclient src/httpserver src/jsmn src/libraries src/littlefs src/logging src/mqtt src/ota src/win32
|
|
|
|
SRC_DIRS ?= src/
|
|
|
|
EXCLUDED_FILES ?= src/httpserver/http_tcp_server.c src/ota/ota.c src/cmnds/cmd_tcp.c src/memory/memtest.c src/new_ping.c src/win_main_scriptOnly.c src/driver/drv_ir2.c src/driver/drv_ir.cpp
|
|
|
|
SRCS := $(filter-out $(EXCLUDED_FILES), $(wildcard $(shell find $(SRC_DIRS) -not \( -path "src/hal/bl602" -prune \) -not \( -path "src/hal/xr809" -prune \) -not \( -path "src/hal/w800" -prune \) -not \( -path "src/hal/bk7231" -prune \) -name *.c | sort -k 1nr | cut -f2-)))
|
|
|
|
INC_DIRS := include $(shell find $(SRC_DIRS) -type d)
|
|
INC_DIRS := $(filter-out src/hal/bl602 src/hal/xr809 src/hal/w800 src/hal/bk7231 src/memory, $(wildcard $(INC_DIRS)))
|
|
|
|
INCLUDES := $(addprefix -I,$(INC_DIRS))
|
|
|
|
default: $(BUILD_DIR)/$(TARGET_EXEC)
|
|
|
|
BERRY_SRCPATH = libraries/berry/src/
|
|
# different frameworks put object files in different places,
|
|
# berry needs to add a rule to autogenerate some files before the object files
|
|
# are built, so it needs the translation function from a C source to an object
|
|
# file
|
|
define obj_from_c
|
|
$(patsubst %.c, %.o, $(1))
|
|
endef
|
|
|
|
include libraries/berry.mk
|
|
|
|
SRCS += $(BERRY_SRC_C)
|
|
|
|
|
|
#OBJS := $(SRCS:%=$(BUILD_DIR)/%.o)
|
|
OBJS := $(SRCS:%=$(BUILD_DIR)/%.o)
|
|
DEPS := $(OBJS:.o=.d)
|
|
|
|
|
|
LDLIBS := -lpthread -lm -lnsl
|
|
|
|
CPPFLAGS ?= $(INCLUDES) -MMD -MP -std=gnu99 -DWINDOWS -DLINUX
|
|
|
|
|
|
CFLAGS ?= -std=gnu99 -W -Wall -Wextra -g
|
|
|
|
$(BUILD_DIR)/$(TARGET_EXEC): $(OBJS)
|
|
@echo "Linking: $@"
|
|
$(CC) $(OBJS) -o $@ $(LDFLAGS) $(LDLIBS)
|
|
|
|
# c source
|
|
$(BUILD_DIR)/%.c.o: %.c
|
|
$(MKDIR_P) $(dir $@)
|
|
@echo "Compiling: $< -> $@"
|
|
$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
|
|
|
|
.PHONY: clean
|
|
|
|
clean:
|
|
$(RM) -r $(BUILD_DIR)
|
|
|
|
-include $(DEPS)
|
|
|
|
|
|
MKDIR_P ?= mkdir -p
|
|
|