Skip to content

Commit

Permalink
Merge pull request #288 from LinjingZhang/master
Browse files Browse the repository at this point in the history
Fix: remove namespace ifx
  • Loading branch information
LinjingZhang committed Jul 16, 2024
2 parents 86c623f + 24a2865 commit 3461caa
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 10 deletions.
1 change: 0 additions & 1 deletion libraries/CAN/README_CAN.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

```arduino
#include <CAN.h>
using namespace ifx;
```

## Setup
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

#include <CAN.h>
using namespace ifx;

void setup() {
Serial.begin(9600);
Expand Down
1 change: 0 additions & 1 deletion libraries/CAN/examples/CANSender/CANSender.ino
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

#include <CAN.h>
using namespace ifx;

void setup() {
Serial.begin(9600);
Expand Down
3 changes: 0 additions & 3 deletions libraries/CAN/src/CANXMC.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include "CANXMC.h"
#include <Arduino.h>

namespace ifx {

/* CAN Receive Message Object definition, can also be used for transmit remote
* frame*/
Expand Down Expand Up @@ -329,5 +328,3 @@ void CAN0_3_IRQHandler() {
}

CANXMC CAN(&XMC_CAN_0);

}; // namespace ifx
5 changes: 1 addition & 4 deletions libraries/CAN/src/CANXMC.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include "CANController.h"
#include "xmc_can.h"

namespace ifx {
class CANXMC : public CANControllerClass {

public:
Expand Down Expand Up @@ -34,6 +33,4 @@ class CANXMC : public CANControllerClass {
XMC_ARD_CAN_t *_XMC_CAN_config;
};

extern CANXMC CAN;

}; // namespace ifx
extern CANXMC CAN;

0 comments on commit 3461caa

Please sign in to comment.