Revision 35880232 modules/LightRing_1-2/test/PN532/module_test_PN532.c

View differences:

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 = {
43
 // /* driver           */ &moduleQiCharger, // !!!!
44
 // /* x alignment      */ 0.0f,
45
 // /* y alignment      */ 0.0f,
46
 // /* op freq          */ 0.0f,
47
 // /* voltage          */ 0.0f,
48
 // /* current          */ 0.0f,
49
 // /* timeout */ MICROSECONDS_PER_SECOND,
50
//};
42
static aos_test_pn532data_t _data = {
43
  /* driver           */ &moduleNfc, // !!
44
  /* timeout */ MICROSECONDS_PER_SECOND,
45
};
51 46

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

  
54 49
/******************************************************************************/
55 50
/* LOCAL FUNCTIONS                                                            */
......
59 54
/* EXPORTED FUNCTIONS                                                         */
60 55
/******************************************************************************/
61 56

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

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

  
73
//  return AOS_OK;
74
//}
68
  return AOS_OK;
69
}
75 70

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

  

Also available in: Unified diff