Browse Source

Update some headers

pull/1/head
Scott Lahteine 6 years ago
parent
commit
7e58d33a2e
  1. 2
      Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.cpp
  2. 2
      Marlin/src/HAL/HAL_ESP32/WebSocketSerial.cpp
  3. 2
      Marlin/src/HAL/HAL_ESP32/WebSocketSerial.h
  4. 7
      Marlin/src/HAL/HAL_ESP32/web.cpp
  5. 7
      Marlin/src/HAL/HAL_ESP32/web.h
  6. 7
      Marlin/src/HAL/HAL_ESP32/wifi.cpp
  7. 7
      Marlin/src/HAL/HAL_ESP32/wifi.h
  8. 92
      Marlin/src/HAL/HAL_STM32F4/EEPROM_Emul/eeprom_emul.h
  9. 92
      Marlin/src/HAL/HAL_STM32F7/EEPROM_Emul/eeprom_emul.h
  10. 2
      Marlin/src/feature/host_actions.cpp
  11. 2
      Marlin/src/feature/host_actions.h
  12. 2
      Marlin/src/gcode/host/M876.cpp
  13. 2
      Marlin/src/gcode/temperature/M141_M191.cpp
  14. 2
      Marlin/src/lcd/menu/menu_service.cpp
  15. 2
      Marlin/src/libs/bresenham.h

2
Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.cpp

@ -1,6 +1,6 @@
/** /**
* Marlin 3D Printer Firmware * Marlin 3D Printer Firmware
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* *
* Based on Sprinter and grbl. * Based on Sprinter and grbl.
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm

2
Marlin/src/HAL/HAL_ESP32/WebSocketSerial.cpp

@ -1,6 +1,6 @@
/** /**
* Marlin 3D Printer Firmware * Marlin 3D Printer Firmware
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* *
* Based on Sprinter and grbl. * Based on Sprinter and grbl.
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm

2
Marlin/src/HAL/HAL_ESP32/WebSocketSerial.h

@ -1,6 +1,6 @@
/** /**
* Marlin 3D Printer Firmware * Marlin 3D Printer Firmware
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* *
* Based on Sprinter and grbl. * Based on Sprinter and grbl.
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm

7
Marlin/src/HAL/HAL_ESP32/web.cpp

@ -1,7 +1,9 @@
/** /**
* Marlin 3D Printer Firmware * Marlin 3D Printer Firmware
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com *
* Based on Sprinter and grbl.
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -15,6 +17,7 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/ */
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32

7
Marlin/src/HAL/HAL_ESP32/web.h

@ -1,7 +1,9 @@
/** /**
* Marlin 3D Printer Firmware * Marlin 3D Printer Firmware
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com *
* Based on Sprinter and grbl.
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -15,6 +17,7 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/ */
#pragma once #pragma once

7
Marlin/src/HAL/HAL_ESP32/wifi.cpp

@ -1,7 +1,9 @@
/** /**
* Marlin 3D Printer Firmware * Marlin 3D Printer Firmware
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com *
* Based on Sprinter and grbl.
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -15,6 +17,7 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/ */
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32

7
Marlin/src/HAL/HAL_ESP32/wifi.h

@ -1,7 +1,9 @@
/** /**
* Marlin 3D Printer Firmware * Marlin 3D Printer Firmware
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com *
* Based on Sprinter and grbl.
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -15,6 +17,7 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/ */
#pragma once #pragma once

92
Marlin/src/HAL/HAL_STM32F4/EEPROM_Emul/eeprom_emul.h

@ -1,50 +1,48 @@
/** /******************************************************************************
****************************************************************************** * @file eeprom_emul.h
* @file EEPROM/EEPROM_Emulation/inc/eeprom.h * @author MCD Application Team
* @author MCD Application Team * @version V1.2.6
* @version V1.2.6 * @date 04-November-2016
* @date 04-November-2016 * @brief This file contains all the functions prototypes for the EEPROM
* @brief This file contains all the functions prototypes for the EEPROM * emulation firmware library.
* emulation firmware library. ******************************************************************************
****************************************************************************** * @attention
* @attention *
* * <h2><center>&copy; Copyright 2016 STMicroelectronics International N.V.
* <h2><center>&copy; Copyright 2016 STMicroelectronics International N.V. * All rights reserved.</center></h2>
* All rights reserved.</center></h2> *
* * Redistribution and use in source and binary forms, with or without
* Redistribution and use in source and binary forms, with or without * modification, are permitted, provided that the following conditions are met:
* modification, are permitted, provided that the following conditions are met: *
* * 1. Redistribution of source code must retain the above copyright notice,
* 1. Redistribution of source code must retain the above copyright notice, * this list of conditions and the following disclaimer.
* this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright notice,
* 2. Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation
* this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution.
* and/or other materials provided with the distribution. * 3. Neither the name of STMicroelectronics nor the names of other
* 3. Neither the name of STMicroelectronics nor the names of other * contributors to this software may be used to endorse or promote products
* contributors to this software may be used to endorse or promote products * derived from this software without specific written permission.
* derived from this software without specific written permission. * 4. This software, including modifications and/or derivative works of this
* 4. This software, including modifications and/or derivative works of this * software, must execute solely and exclusively on microcontroller or
* software, must execute solely and exclusively on microcontroller or * microprocessor devices manufactured by or for STMicroelectronics.
* microprocessor devices manufactured by or for STMicroelectronics. * 5. Redistribution and use of this software other than as permitted under
* 5. Redistribution and use of this software other than as permitted under * this license is void and will automatically terminate your rights under
* this license is void and will automatically terminate your rights under * this license.
* this license. *
* * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS"
* THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT
* AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY
* PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT
* RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
* ******************************************************************************/
******************************************************************************
*/
#pragma once #pragma once
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------

92
Marlin/src/HAL/HAL_STM32F7/EEPROM_Emul/eeprom_emul.h

@ -1,50 +1,48 @@
/** /******************************************************************************
****************************************************************************** * @file eeprom_emul.h
* @file EEPROM/EEPROM_Emulation/inc/eeprom.h * @author MCD Application Team
* @author MCD Application Team * @version V1.2.6
* @version V1.2.6 * @date 04-November-2016
* @date 04-November-2016 * @brief This file contains all the functions prototypes for the EEPROM
* @brief This file contains all the functions prototypes for the EEPROM * emulation firmware library.
* emulation firmware library. ******************************************************************************
****************************************************************************** * @attention
* @attention *
* * <h2><center>&copy; Copyright © 2016 STMicroelectronics International N.V.
* <h2><center>&copy; Copyright © 2016 STMicroelectronics International N.V. * All rights reserved.</center></h2>
* All rights reserved.</center></h2> *
* * Redistribution and use in source and binary forms, with or without
* Redistribution and use in source and binary forms, with or without * modification, are permitted, provided that the following conditions are met:
* modification, are permitted, provided that the following conditions are met: *
* * 1. Redistribution of source code must retain the above copyright notice,
* 1. Redistribution of source code must retain the above copyright notice, * this list of conditions and the following disclaimer.
* this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright notice,
* 2. Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation
* this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution.
* and/or other materials provided with the distribution. * 3. Neither the name of STMicroelectronics nor the names of other
* 3. Neither the name of STMicroelectronics nor the names of other * contributors to this software may be used to endorse or promote products
* contributors to this software may be used to endorse or promote products * derived from this software without specific written permission.
* derived from this software without specific written permission. * 4. This software, including modifications and/or derivative works of this
* 4. This software, including modifications and/or derivative works of this * software, must execute solely and exclusively on microcontroller or
* software, must execute solely and exclusively on microcontroller or * microprocessor devices manufactured by or for STMicroelectronics.
* microprocessor devices manufactured by or for STMicroelectronics. * 5. Redistribution and use of this software other than as permitted under
* 5. Redistribution and use of this software other than as permitted under * this license is void and will automatically terminate your rights under
* this license is void and will automatically terminate your rights under * this license.
* this license. *
* * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS"
* THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT
* AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY
* PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT
* RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
* *****************************************************************************/
******************************************************************************
*/
#pragma once #pragma once
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------

2
Marlin/src/feature/host_actions.cpp

@ -1,6 +1,6 @@
/** /**
* Marlin 3D Printer Firmware * Marlin 3D Printer Firmware
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* *
* Based on Sprinter and grbl. * Based on Sprinter and grbl.
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm

2
Marlin/src/feature/host_actions.h

@ -1,6 +1,6 @@
/** /**
* Marlin 3D Printer Firmware * Marlin 3D Printer Firmware
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* *
* Based on Sprinter and grbl. * Based on Sprinter and grbl.
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm

2
Marlin/src/gcode/host/M876.cpp

@ -1,6 +1,6 @@
/** /**
* Marlin 3D Printer Firmware * Marlin 3D Printer Firmware
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* *
* Based on Sprinter and grbl. * Based on Sprinter and grbl.
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm

2
Marlin/src/gcode/temperature/M141_M191.cpp

@ -1,6 +1,6 @@
/** /**
* Marlin 3D Printer Firmware * Marlin 3D Printer Firmware
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* *
* Based on Sprinter and grbl. * Based on Sprinter and grbl.
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm

2
Marlin/src/lcd/menu/menu_service.cpp

@ -1,6 +1,6 @@
/** /**
* Marlin 3D Printer Firmware * Marlin 3D Printer Firmware
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* *
* Based on Sprinter and grbl. * Based on Sprinter and grbl.
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm

2
Marlin/src/libs/bresenham.h

@ -1,6 +1,6 @@
/** /**
* Marlin 3D Printer Firmware * Marlin 3D Printer Firmware
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* *
* Based on Sprinter and grbl. * Based on Sprinter and grbl.
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm

Loading…
Cancel
Save