diff --git a/README.md b/README.md index bde4d0ebfe..4c62977d3c 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ Important note - we now use submodules: * [Unit Tests](/unit_tests) Unit tests of firmware pieces * [Misc tools](/java_tools) Misc development utilities * [misc/Jenkins](/misc/jenkins) Jenkins Continues Integration scripts + * [Software Development process](misc/SoftwareDevelopmentProcess.md) * [Work in progress status](work_in_progress.md) # External Links diff --git a/firmware/bootloader/src/rusefi_stubs.cpp b/firmware/bootloader/src/rusefi_stubs.cpp index 50439e5f3e..f62657d8b9 100644 --- a/firmware/bootloader/src/rusefi_stubs.cpp +++ b/firmware/bootloader/src/rusefi_stubs.cpp @@ -31,6 +31,8 @@ LoggingWithStorage::LoggingWithStorage(const char *name) : Logging(name, DEFAULT // this is supposed to be taken from chconf_common.h but it does not work? I am not sure why :( // TODO: make this be defined by chconf_common.h? -void irqEnterHook() {} -void irqExitHook() {} -void contextSwitchHook() {} \ No newline at end of file +#if ! ENABLE_PERF_TRACE +//void irqEnterHook() {} +//void irqExitHook() {} +//void contextSwitchHook() {} +#endif /* ENABLE_PERF_TRACE */ \ No newline at end of file diff --git a/firmware/config/stm32f4ems/chconf.h b/firmware/config/stm32f4ems/chconf.h index 081f7f264e..ce3817b05a 100644 --- a/firmware/config/stm32f4ems/chconf.h +++ b/firmware/config/stm32f4ems/chconf.h @@ -52,7 +52,7 @@ #if !defined(ENABLE_PERF_TRACE) || defined(__DOXYGEN__) // looks like this value could not be defined in efifeatures.h - please define either externally or just change the value here - #define ENABLE_PERF_TRACE TRUE + #define ENABLE_PERF_TRACE FALSE #endif /* ENABLE_PERF_TRACE */ #include "chconf_common.h" diff --git a/misc/SoftwareDevelopmentProcess.md b/misc/SoftwareDevelopmentProcess.md new file mode 100644 index 0000000000..2a81da1a0c --- /dev/null +++ b/misc/SoftwareDevelopmentProcess.md @@ -0,0 +1,20 @@ + + +rusEfi firmware development model is "stable master". We do not have release branches, we only have master with +continues integration and *limited* automated testing. + +By default, each Pull Request is expected to be complete and expected to not break existing functionality. +If a Pull Request is a work-in-progress or draft or not intended for merge yet, it should be clearly marked with "[WIP]" prefix in the title. + +Pull Requests which are not complete, not marked WIP or fail gate check should be closed to reduce a chance of confusion. +It is usually helpful to discuss proposed changes prior to Pull Requests - we have Slack to collaborate and coordinate so let's use! + + + +TODO: we have an urgent need to make gate check more reliable & expand what's included into gate check + +The primary hardware platform for rusEfi is stm32f4 - as of November 2019, only stm32f4 has hardware test continues integration. + + + +See also [Functional tests CI info](jenkins/functional_test_and_build_bundle/readme.md) \ No newline at end of file diff --git a/misc/git_cheat_sheet.txt b/misc/git_scripts/git_cheat_sheet.txt similarity index 100% rename from misc/git_cheat_sheet.txt rename to misc/git_scripts/git_cheat_sheet.txt diff --git a/misc/git_gc.bat b/misc/git_scripts/git_gc.bat similarity index 100% rename from misc/git_gc.bat rename to misc/git_scripts/git_gc.bat diff --git a/misc/jenkins/functional_test_and_build_bundle/readme.md b/misc/jenkins/functional_test_and_build_bundle/readme.md index b8d27c4366..5598a6efea 100644 --- a/misc/jenkins/functional_test_and_build_bundle/readme.md +++ b/misc/jenkins/functional_test_and_build_bundle/readme.md @@ -1,3 +1,8 @@ +This configuration +1) builds bootloader from firmware/bootload just to validate that it builds (TODO: extract to separate job?) +1) compiles two versions of F4 version of firmware - with and without asserts, _fast_ and _debug_. +1) flashes _debug_ version of F4 into stm32f4discovery and runs a suite of tests against it. The source code +of tests is embedded into rusEfi console by the way (TODO: nicer UI for console to test F4 outside of Jenkins?) ```misc/jenkins/functional_test_and_build_bundle/run.bat``` \ No newline at end of file diff --git a/work_in_progress.md b/work_in_progress.md index dd2b13f28a..f0b40f2cc4 100644 --- a/work_in_progress.md +++ b/work_in_progress.md @@ -1,3 +1,7 @@ +Nov, 19 2019 status: +* top priority is https://github.com/rusefi/rusefi/issues/1011 Fix and expand commit gate check +* [DONE] https://github.com/rusefi/rusefi/issues/796 Missing dwell altogether in some corner cases still should be addressed + Sep, 19 2019 status: * https://github.com/rusefi/rusefi/issues/796 Missing dwell altogether in some corner cases still should be addressed * Ion Sense https://rusefi.com/forum/viewtopic.php?f=4&t=963 is now somewhere on top of the list!