Skip to content

Commit 907a450

Browse files
committed
Merge branch 'iabg' into seperate-temperature-probes
# Conflicts: # src/utility/MAX31865/MAX31865.cpp # src/utility/MAX31865/MAX31865.h
2 parents f3d9cdd + 6449441 commit 907a450

File tree

4 files changed

+0
-70
lines changed

4 files changed

+0
-70
lines changed

src/utility/RTC/PCF8563T.cpp

-19
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,3 @@
1-
/*
2-
This file is part of the MachineControl library.
3-
Copyright (c) 2020 Arduino SA.
4-
5-
This library is free software; you can redistribute it and/or
6-
modify it under the terms of the GNU Lesser General Public
7-
License as published by the Free Software Foundation; either
8-
version 2.1 of the License, or (at your option) any later version.
9-
10-
This library is distributed in the hope that it will be useful,
11-
but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13-
Lesser General Public License for more details.
14-
15-
You should have received a copy of the GNU Lesser General Public
16-
License along with this library; if not, write to the Free Software
17-
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18-
*/
19-
201
#include "PCF8563T.h"
212

223
#define PCF8563T_ADDRESS 0x51

src/utility/RTC/PCF8563T.h

-19
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,3 @@
1-
/*
2-
This file is part of the MachineControl library.
3-
Copyright (c) 2020 Arduino SA.
4-
5-
This library is free software; you can redistribute it and/or
6-
modify it under the terms of the GNU Lesser General Public
7-
License as published by the Free Software Foundation; either
8-
version 2.1 of the License, or (at your option) any later version.
9-
10-
This library is distributed in the hope that it will be useful,
11-
but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13-
Lesser General Public License for more details.
14-
15-
You should have received a copy of the GNU Lesser General Public
16-
License along with this library; if not, write to the Free Software
17-
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18-
*/
19-
201
#ifndef _PCF8563T_H_INCLUDED
212
#define _PCF8563T_H_INCLUDED
223

src/utility/ioexpander/ArduinoIOExpander.cpp

-16
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
/*
2-
This file is part of the MachineControl library.
3-
Copyright (C) 2020 Arduino AG (http://www.arduino.cc/)
4-
This library is free software; you can redistribute it and/or
5-
modify it under the terms of the GNU Lesser General Public
6-
License as published by the Free Software Foundation; either
7-
version 2.1 of the License, or (at your option) any later version.
8-
This library is distributed in the hope that it will be useful,
9-
but WITHOUT ANY WARRANTY; without even the implied warranty of
10-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11-
Lesser General Public License for more details.
12-
You should have received a copy of the GNU Lesser General Public
13-
License along with this library; if not, write to the Free Software
14-
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15-
*/
16-
171
#include "ArduinoIOExpander.h"
182

193
bool ArduinoIOExpanderClass::begin()

src/utility/ioexpander/ArduinoIOExpander.h

-16
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
/*
2-
This file is part of the MachineControl library.
3-
Copyright (C) 2020 Arduino AG (http://www.arduino.cc/)
4-
This library is free software; you can redistribute it and/or
5-
modify it under the terms of the GNU Lesser General Public
6-
License as published by the Free Software Foundation; either
7-
version 2.1 of the License, or (at your option) any later version.
8-
This library is distributed in the hope that it will be useful,
9-
but WITHOUT ANY WARRANTY; without even the implied warranty of
10-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11-
Lesser General Public License for more details.
12-
You should have received a copy of the GNU Lesser General Public
13-
License along with this library; if not, write to the Free Software
14-
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15-
*/
16-
171
#pragma once
182

193
#include <Arduino.h>

0 commit comments

Comments
 (0)