Revision 8c87e304

View differences:

modules/LightRing_1-2/Makefile
146 146
                            $(AMIROLLD)/drivers/LED/v1 \
147 147
                            $(AMIROLLD)/drivers/MIC9404x/v1 \
148 148
                            $(AMIROLLD)/drivers/P9221R/v1 \
149
                            $(AMIROLLD)/drivers/PN532/v1 \
149 150
                            $(AMIROLLD)/drivers/TLC5947/v1
150 151

  
151 152
# Tests.
......
154 155
                    $(AMIROOS_TEST_DIR)periphery-lld/LED_v1 \
155 156
                    $(AMIROOS_TEST_DIR)periphery-lld/MIC9404x_v1 \
156 157
                    $(AMIROOS_TEST_DIR)periphery-lld/P9221R_v1 \
158
                    $(AMIROOS_TEST_DIR)periphery-lld/PN532_v1 \
157 159
                    $(AMIROOS_TEST_DIR)periphery-lld/TLC5947_v1
158 160

  
159 161
# Module specific inclusion directories
modules/LightRing_1-2/test/PN532/module_test_PN532.c
21 21
#if (AMIROOS_CFG_TESTS_ENABLE == true) || defined(__DOXYGEN__)
22 22

  
23 23
#include <module_test_PN532.h>
24
#include <aos_test_PN532.h>
24
//#include <aos_test_PN532.h>
25 25

  
26 26
/******************************************************************************/
27 27
/* LOCAL DEFINITIONS                                                          */
......
39 39
/* LOCAL VARIABLES                                                            */
40 40
/******************************************************************************/
41 41

  
42
static aos_test_pn532data_t _data = {
42
//static aos_test_pn532data_t _data = {
43 43
 // /* driver           */ &moduleQiCharger, // !!!!
44 44
 // /* x alignment      */ 0.0f,
45 45
 // /* y alignment      */ 0.0f,
......
47 47
 // /* voltage          */ 0.0f,
48 48
 // /* current          */ 0.0f,
49 49
 // /* timeout */ MICROSECONDS_PER_SECOND,
50
};
50
//};
51 51

  
52
static AOS_TEST(_test, "PN532", "nfc", moduleTestPn532ShellCb, aosTestPn532Func, &_data);
52
//static AOS_TEST(_test, "PN532", "nfc", moduleTestPn532ShellCb, aosTestPn532Func, &_data);
53 53

  
54 54
/******************************************************************************/
55 55
/* LOCAL FUNCTIONS                                                            */
......
59 59
/* EXPORTED FUNCTIONS                                                         */
60 60
/******************************************************************************/
61 61

  
62
 int moduleTestPn532ShellCb(BaseSequentialStream* stream, int argc, char* argv[], aos_testresult_t* result)
63
{
64
  (void)argc;
65
  (void)argv;
62
// int moduleTestPn532ShellCb(BaseSequentialStream* stream, int argc, char* argv[], aos_testresult_t* result)
63
//{
64
//  (void)argc;
65
//  (void)argv;
66 66

  
67
  if (result != NULL) {
68
    *result = aosTestRun(stream, &_test, NULL);
69
  } else {
70
    aosTestRun(stream, &_test, NULL);
71
  }
67
//  if (result != NULL) {
68
//    *result = aosTestRun(stream, &_test, NULL);
69
//  } else {
70
//    aosTestRun(stream, &_test, NULL);
71
//  }
72 72

  
73
  return AOS_OK;
74
}
73
//  return AOS_OK;
74
//}
75 75

  
76 76
#endif /* (AMIROOS_CFG_TESTS_ENABLE == true) */
77 77

  

Also available in: Unified diff