andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fix some comment formatting

pull/1/head
Scott Lahteine 6 years ago
parent
2f873a119f
commit
7a04eb3a8b
5 changed files with 69 additions and 81 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Marlin/src/HAL/HAL_DUE/MarlinSerialUSB_Due.cpp
  2. 35
      Marlin/src/HAL/HAL_STM32/spi_pins.h
  3. 50
      Marlin/src/HAL/HAL_STM32F4/spi_pins.h
  4. 41
      Marlin/src/HAL/HAL_STM32F7/spi_pins.h
  5. 20
      Marlin/src/lcd/lcdprint_hd44780.cpp

4
Marlin/src/HAL/HAL_DUE/MarlinSerialUSB_Due.cpp
View File

@ -143,8 +143,8 @@ void MarlinSerialUSB::write(const uint8_t c) {
} }
/** /**
* Imports from print.h * Imports from print.h
*/ */
void MarlinSerialUSB::print(char c, int base) { void MarlinSerialUSB::print(char c, int base) {
print((long)c, base); print((long)c, base);

35
Marlin/src/HAL/HAL_STM32/spi_pins.h
View File

@ -1,26 +1,25 @@
/** /**
* Marlin 3D Printer Firmware * Marlin 3D Printer Firmware
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* *
* 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
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* 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
/** /**
* Define SPI Pins: SCK, MISO, MOSI, SS * Define SPI Pins: SCK, MISO, MOSI, SS
*
*/ */
#ifndef SCK_PIN #ifndef SCK_PIN
#define SCK_PIN 13 #define SCK_PIN 13

50
Marlin/src/HAL/HAL_STM32F4/spi_pins.h
View File

@ -1,41 +1,35 @@
/** /**
* Marlin 3D Printer Firmware * Marlin 3D Printer Firmware
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* *
* 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
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* 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
#ifndef SPI_PINS_H_
#define SPI_PINS_H_
/** /**
* Define SPI Pins: SCK, MISO, MOSI, SS * Define SPI Pins: SCK, MISO, MOSI, SS
*
*/ */
#ifndef SCK_PIN #ifndef SCK_PIN
#define SCK_PIN PA5 #define SCK_PIN PA5
#endif #endif
#ifndef MISO_PIN #ifndef MISO_PIN
#define MISO_PIN PA6 #define MISO_PIN PA6
#endif #endif
#ifndef MOSI_PIN #ifndef MOSI_PIN
#define MOSI_PIN PA7 #define MOSI_PIN PA7
#endif #endif
#ifndef SS_PIN #ifndef SS_PIN
#define SS_PIN PA8 #define SS_PIN PA8
#endif #endif
#endif // SPI_PINS_H_

41
Marlin/src/HAL/HAL_STM32F7/spi_pins.h
View File

@ -1,32 +1,27 @@
/** /**
* Marlin 3D Printer Firmware * Marlin 3D Printer Firmware
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* *
* 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
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* 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
#ifndef SPI_PINS_H_
#define SPI_PINS_H_
/** /**
* Define SPI Pins: SCK, MISO, MOSI, SS * Define SPI Pins: SCK, MISO, MOSI, SS
*
*/ */
#define SCK_PIN PA5 #define SCK_PIN PA5
#define MISO_PIN PA6 #define MISO_PIN PA6
#define MOSI_PIN PA7 #define MOSI_PIN PA7
#define SS_PIN PA8 #define SS_PIN PA8
#endif // SPI_PINS_H_

20
Marlin/src/lcd/lcdprint_hd44780.cpp
View File

@ -1010,16 +1010,16 @@ int lcd_put_wchar_max(wchar_t c, pixel_len_t max_length) {
} }
/** /**
* @brief Draw a UTF-8 string * @brief Draw a UTF-8 string
* *
* @param utf8_str : the UTF-8 string * @param utf8_str : the UTF-8 string
* @param cb_read_byte : the callback function to read one byte from the utf8_str (from RAM or ROM) * @param cb_read_byte : the callback function to read one byte from the utf8_str (from RAM or ROM)
* @param max_length : the pixel length of the string allowed (or number of slots in HD44780) * @param max_length : the pixel length of the string allowed (or number of slots in HD44780)
* *
* @return the number of pixels advanced * @return the number of pixels advanced
* *
* Draw a UTF-8 string * Draw a UTF-8 string
*/ */
static int lcd_put_u8str_max_cb(const char * utf8_str, uint8_t (*cb_read_byte)(uint8_t * str), pixel_len_t max_length) { static int lcd_put_u8str_max_cb(const char * utf8_str, uint8_t (*cb_read_byte)(uint8_t * str), pixel_len_t max_length) {
pixel_len_t ret = 0; pixel_len_t ret = 0;
uint8_t *p = (uint8_t *)utf8_str; uint8_t *p = (uint8_t *)utf8_str;

Write Preview
Loading…
Cancel
Save