Revision 4a0e2139
| bootloader/AMiRo-BLT | ||
|---|---|---|
| 1 |
Subproject commit 2880bac8f7c2bc4873cfdd9e88a914fb10659f59 |
|
| 1 |
Subproject commit 03906dc3eea1bcc0aa880aeadd1bc1ba1d26d472 |
|
| core/core.mk | ||
|---|---|---|
| 30 | 30 |
AMIROOSCOREINC = $(AMIROOS_CORE_DIR)inc |
| 31 | 31 |
|
| 32 | 32 |
# C source files |
| 33 |
<<<<<<< Updated upstream |
|
| 33 | 34 |
AMIROOSCORECSRC = $(wildcard $(AMIROOS_CORE_DIR)src/*.c) |
| 35 |
======= |
|
| 36 |
AMIROOSCORECSRC = $(AMIROOS_CORE_DIR)src/aos_debug.c \ |
|
| 37 |
$(AMIROOS_CORE_DIR)src/aos_iostream.c \ |
|
| 38 |
$(AMIROOS_CORE_DIR)src/aos_rtcan.c \ |
|
| 39 |
$(AMIROOS_CORE_DIR)src/aos_shell.c \ |
|
| 40 |
$(AMIROOS_CORE_DIR)src/aos_system.c \ |
|
| 41 |
$(AMIROOS_CORE_DIR)src/aos_thread.c \ |
|
| 42 |
$(AMIROOS_CORE_DIR)src/aos_time.c \ |
|
| 43 |
$(AMIROOS_CORE_DIR)src/aos_timer.c \ |
|
| 44 |
$(AMIROOS_CORE_DIR)src/aos_unittest.c |
|
| 45 |
>>>>>>> Stashed changes |
|
| 34 | 46 |
|
| 35 | 47 |
# C++ source files |
| 36 | 48 |
AMIROOSCORECPPSRC = $(wildcard $(AMIROOS_CORE_DIR)src/*.c?*) |
| modules/PowerManagement_1-1/module.c | ||
|---|---|---|
| 90 | 90 |
/* mode */ PWM_OUTPUT_ACTIVE_HIGH, |
| 91 | 91 |
/* callback */ NULL |
| 92 | 92 |
}, |
| 93 |
/* channel 2 */ {
|
|
| 93 |
/* channel 2 f */ {
|
|
| 94 | 94 |
/* mode */ PWM_OUTPUT_DISABLED, |
| 95 | 95 |
/* callback */ NULL |
| 96 | 96 |
}, |
| ... | ... | |
| 1473 | 1473 |
|
| 1474 | 1474 |
#endif /* BOARD_SENSORRING == BOARD_DISTANCESENSOR_VL53L1X */ |
| 1475 | 1475 |
|
| 1476 |
static ut_rtcandata_t _utLldRtCanData = {
|
|
| 1477 |
/*operation */ NULL |
|
| 1478 |
}; |
|
| 1479 |
|
|
| 1480 |
static int _utShellCmdCb_LldRtCan(BaseSequentialStream* stream, int argc, char* argv[]) |
|
| 1481 |
{
|
|
| 1482 |
if(argc == 2 ){
|
|
| 1483 |
if (strcmp(argv[1], "send") == 0) {
|
|
| 1484 |
((ut_rtcandata_t*)moduleUtLldRtCan.data)->operation = "send"; |
|
| 1485 |
aosUtRun(stream, &moduleUtLldRtCan,NULL); |
|
| 1486 |
return AOS_OK; |
|
| 1487 |
}else if(strcmp(argv[1], "receive") == 0){
|
|
| 1488 |
((ut_rtcandata_t*)moduleUtLldRtCan.data)->operation = "receive"; |
|
| 1489 |
aosUtRun(stream, &moduleUtLldRtCan,NULL); |
|
| 1490 |
return AOS_OK; |
|
| 1491 |
} |
|
| 1492 |
} |
|
| 1493 |
return AOS_INVALID_ARGUMENTS; |
|
| 1494 |
} |
|
| 1495 |
aos_unittest_t moduleUtLldRtCan = {
|
|
| 1496 |
/* name */ "RTCAN", |
|
| 1497 |
/* info */ NULL, |
|
| 1498 |
/* test function */ utLldRtCanFunc, |
|
| 1499 |
/* shell command */ {
|
|
| 1500 |
/* name */ "unittest:rtcan", |
|
| 1501 |
/* callback */ _utShellCmdCb_LldRtCan, |
|
| 1502 |
/* next */ NULL, |
|
| 1503 |
}, |
|
| 1504 |
/* data */ &_utLldRtCanData, |
|
| 1505 |
}; |
|
| 1506 |
|
|
| 1476 | 1507 |
#endif /* AMIROOS_CFG_TESTS_ENABLE == true */ |
| 1477 | 1508 |
|
| 1478 | 1509 |
/** @} */ |
| modules/PowerManagement_1-1/module.h | ||
|---|---|---|
| 444 | 444 |
aosShellAddCommand(&aos.shell, &moduleUtAlldTps62113.shellcmd); \ |
| 445 | 445 |
aosShellAddCommand(&aos.shell, &moduleUtAlldTps62113Ina219.shellcmd); \ |
| 446 | 446 |
MODULE_INIT_TEST_SENSORRING(); \ |
| 447 |
aosShellAddCommand(&aos.shell, &moduleUtAlldVcnl4020.shellcmd); \ |
|
| 448 |
aosShellAddCommand(&aos.shell, &moduleUtLldRtCan.shellcmd); \ |
|
| 447 | 449 |
} |
| 448 | 450 |
#if (BOARD_SENSORRING == BOARD_PROXIMITYSENSOR) || defined(__DOXYGEN__) |
| 449 | 451 |
#define MODULE_INIT_TEST_SENSORRING() { \
|
| ... | ... | |
| 732 | 734 |
|
| 733 | 735 |
#endif /* BOARD_SENSORRING == BOARD_DISTANCESENSOR_VL53L1X */ |
| 734 | 736 |
|
| 737 |
|
|
| 735 | 738 |
/** @} */ |
| 736 | 739 |
|
| 737 | 740 |
/*===========================================================================*/ |
| ... | ... | |
| 751 | 754 |
#include <ut_alld_pklcs1212e4001.h> |
| 752 | 755 |
#include <ut_alld_tps62113.h> |
| 753 | 756 |
#include <ut_alld_tps62113_ina219.h> |
| 757 |
#include <ut_alld_vcnl4020.h> |
|
| 758 |
#include <ut_lld_rtcan.h> |
|
| 754 | 759 |
|
| 755 | 760 |
/** |
| 756 | 761 |
* @brief ADC unit test object. |
| ... | ... | |
| 859 | 864 |
|
| 860 | 865 |
#endif /* BOARD_SENSORRING == BOARD_DISTANCESENSOR_VL53L1X */ |
| 861 | 866 |
|
| 867 |
/** |
|
| 868 |
* @brief RtCan unit test object. |
|
| 869 |
*/ |
|
| 870 |
extern aos_unittest_t moduleUtLldRtCan; |
|
| 871 |
|
|
| 862 | 872 |
#endif /* AMIROOS_CFG_TESTS_ENABLE == true */ |
| 863 | 873 |
|
| 864 | 874 |
/** @} */ |
| periphery-lld/AMiRo-LLD | ||
|---|---|---|
| 1 |
Subproject commit bb46c559fac6ba3c2c9e1516d4a4171213263157 |
|
| 1 |
Subproject commit 11500ad81cfe6291b84e2faaf5731446da4014d4 |
|
| unittests/unittests.mk | ||
|---|---|---|
| 31 | 31 |
$(UNITTESTS_DIR)periphery-lld/inc |
| 32 | 32 |
|
| 33 | 33 |
# C sources |
| 34 |
<<<<<<< Updated upstream |
|
| 34 | 35 |
UNITTESTSCSRC = $(wildcard $(UNITTESTS_DIR)lld/src/*.c) \ |
| 35 | 36 |
$(wildcard $(UNITTESTS_DIR)periphery-lld/src/*.c) |
| 37 |
======= |
|
| 38 |
UNITTESTSCSRC = $(UNITTESTS_DIR)lld/src/ut_lld_adc.c \ |
|
| 39 |
$(UNITTESTS_DIR)lld/src/ut_lld_rtcan.c \ |
|
| 40 |
$(UNITTESTS_DIR)periphery-lld/src/ut_alld_a3906.c \ |
|
| 41 |
$(UNITTESTS_DIR)periphery-lld/src/ut_alld_at24c01bn-sh-b.c \ |
|
| 42 |
$(UNITTESTS_DIR)periphery-lld/src/ut_alld_bq24103a.c \ |
|
| 43 |
$(UNITTESTS_DIR)periphery-lld/src/ut_alld_bq27500.c \ |
|
| 44 |
$(UNITTESTS_DIR)periphery-lld/src/ut_alld_bq27500_bq24103a.c \ |
|
| 45 |
$(UNITTESTS_DIR)periphery-lld/src/ut_alld_hmc5883l.c \ |
|
| 46 |
$(UNITTESTS_DIR)periphery-lld/src/ut_alld_ina219.c \ |
|
| 47 |
$(UNITTESTS_DIR)periphery-lld/src/ut_alld_l3g4200d.c \ |
|
| 48 |
$(UNITTESTS_DIR)periphery-lld/src/ut_alld_led.c \ |
|
| 49 |
$(UNITTESTS_DIR)periphery-lld/src/ut_alld_lis331dlh.c \ |
|
| 50 |
$(UNITTESTS_DIR)periphery-lld/src/ut_alld_ltc4412.c \ |
|
| 51 |
$(UNITTESTS_DIR)periphery-lld/src/ut_alld_mpr121.c \ |
|
| 52 |
$(UNITTESTS_DIR)periphery-lld/src/ut_alld_pca9544a.c \ |
|
| 53 |
$(UNITTESTS_DIR)periphery-lld/src/ut_alld_pklcs1212e4001.c \ |
|
| 54 |
$(UNITTESTS_DIR)periphery-lld/src/ut_alld_tlc5947.c \ |
|
| 55 |
$(UNITTESTS_DIR)periphery-lld/src/ut_alld_tps2051bdbv.c \ |
|
| 56 |
$(UNITTESTS_DIR)periphery-lld/src/ut_alld_tps62113.c \ |
|
| 57 |
$(UNITTESTS_DIR)periphery-lld/src/ut_alld_tps62113_ina219.c \ |
|
| 58 |
$(UNITTESTS_DIR)periphery-lld/src/ut_alld_vcnl4020.c \ |
|
| 59 |
$(UNITTESTS_DIR)periphery-lld/src/ut_alld_dw1000.c |
|
| 60 |
>>>>>>> Stashed changes |
|
| 36 | 61 |
|
Also available in: Unified diff