bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Drop C-style 'void' argument

Browse Source
This commit is contained in:
Scott Lahteine
2019-09-16 20:31:08 -05:00
parent 7d8c38693f
commit f01f0d1956
174 changed files with 864 additions and 864 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
View File

@ -29,7 +29,7 @@
#endif
extern LCD_CLASS lcd;
int lcd_glyph_height(void) { return 1; }
int lcd_glyph_height() { return 1; }
typedef struct _hd44780_charmap_t {
wchar_t uchar; // the unicode char
@ -1012,7 +1012,7 @@ int lcd_put_u8str_max_P(PGM_P utf8_str_P, pixel_len_t max_length) {
return 0;
}
int test_hd44780_charmap_all(void) {
int test_hd44780_charmap_all() {
int flg_error = 0;
if (test_hd44780_charmap(g_hd44780_charmap_device, COUNT(g_hd44780_charmap_device), "g_hd44780_charmap_device", 0) < 0) {
flg_error = 1;

2
Marlin/src/lcd/dogm/lcdprint_u8g.cpp
View File

@ -20,7 +20,7 @@
#include "u8g_fontutf8.h"
#include "../lcdprint.h"
int lcd_glyph_height(void) { return u8g_GetFontBBXHeight(u8g.getU8g()); }
int lcd_glyph_height() { return u8g_GetFontBBXHeight(u8g.getU8g()); }
void lcd_moveto(const lcd_uint_t col, const lcd_uint_t row) { u8g.setPrintPos(col, row); }

2
Marlin/src/lcd/dogm/u8g_fontutf8.cpp
View File

@ -119,7 +119,7 @@ static font_group_t g_fontgroup_root = { nullptr, 0 };
/**
* @brief check if font is loaded
*/
static inline bool uxg_Utf8FontIsInited(void) { return flag_fontgroup_was_inited; }
static inline bool uxg_Utf8FontIsInited() { return flag_fontgroup_was_inited; }
int uxg_SetUtf8Fonts (const uxg_fontinfo_t * fntinfo, int number) {
flag_fontgroup_was_inited = 1;

6
Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp
View File

@ -103,7 +103,7 @@ public:
// ISR for Rx
void store_rxd_char();
// ISR for Tx (UDRE vector)
void tx_udr_empty_irq(void);
void tx_udr_empty_irq();
inline volatile bool is_rx_overrun() {
return dgus_rx_overrun;
@ -1013,7 +1013,7 @@ FORCE_INLINE void DGUSSerial::store_rxd_char() {
}
// (called with TX irqs disabled)
FORCE_INLINE void DGUSSerial::tx_udr_empty_irq(void) {
FORCE_INLINE void DGUSSerial::tx_udr_empty_irq() {
// Read positions
uint8_t t = tx_buffer.tail;
const uint8_t h = tx_buffer.head;
@ -1039,7 +1039,7 @@ FORCE_INLINE void DGUSSerial::tx_udr_empty_irq(void) {
if (h == t) CBI(DGUS_UCSRxB, UDRIEx);
}
r_ring_buffer_pos_t DGUSSerial::available(void) {
r_ring_buffer_pos_t DGUSSerial::available() {
const r_ring_buffer_pos_t h = atomic_read_rx_head(), t = rx_buffer.tail;
return (r_ring_buffer_pos_t) (DGUS_RX_BUFFER_SIZE + h - t) & (DGUS_RX_BUFFER_SIZE - 1);
}

8
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/basic/commands.cpp
View File

@ -29,11 +29,11 @@
using namespace FTDI;
using namespace FTDI::SPI;
void CLCD::enable(void) {
void CLCD::enable() {
mem_write_8(REG::PCLK, Pclk);
}
void CLCD::disable(void) {
void CLCD::disable() {
mem_write_8(REG::PCLK, 0x00);
}
@ -45,7 +45,7 @@ uint8_t CLCD::get_brightness() {
return mem_read_8(REG::PWM_DUTY);
}
void CLCD::turn_on_backlight(void) {
void CLCD::turn_on_backlight() {
mem_write_8(REG::PWM_DUTY, 128);
}
@ -1052,7 +1052,7 @@ void CLCD::CommandFifo::str(progmem_str data) {
/******************* LCD INITIALIZATION ************************/
void CLCD::init(void) {
void CLCD::init() {
spi_init(); // Set Up I/O Lines for SPI and FT800/810 Control
ftdi_reset(); // Power down/up the FT8xx with the apropriate delays

18
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/basic/commands.h
View File

@ -124,12 +124,12 @@ class CLCD {
class CommandFifo;
class FontMetrics;
static void init(void);
static void default_touch_transform(void);
static void default_display_orientation(void);
static void turn_on_backlight(void);
static void enable(void);
static void disable(void);
static void init();
static void default_touch_transform();
static void default_display_orientation();
static void turn_on_backlight();
static void enable();
static void disable();
static void set_brightness (uint8_t brightness);
static uint8_t get_brightness();
static void host_cmd (unsigned char host_command, unsigned char byte2);
@ -179,7 +179,7 @@ class CLCD::CommandFifo {
static uint32_t command_write_ptr;
template <class T> bool _write_unaligned(T data, uint16_t len);
#endif
void start(void);
void start();
public:
template <class T> bool write(T data, uint16_t len);
@ -187,11 +187,11 @@ class CLCD::CommandFifo {
public:
CommandFifo() {start();}
static void reset(void);
static void reset();
static bool is_processing();
static bool has_fault();
void execute(void);
void execute();
void cmd(uint32_t cmd32);
void cmd(void* data, uint16_t len);

10
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/basic/spi.cpp
View File

@ -31,7 +31,7 @@ namespace FTDI {
SPISettings SPI::spi_settings(SPI_FREQUENCY, MSBFIRST, SPI_MODE0);
#endif
void SPI::spi_init(void) {
void SPI::spi_init() {
SET_OUTPUT(CLCD_MOD_RESET); // Module Reset (a.k.a. PD, not SPI)
WRITE(CLCD_MOD_RESET, 0); // start with module in power-down
@ -106,7 +106,7 @@ namespace FTDI {
}
// CLCD SPI - Chip Select
void SPI::spi_ftdi_select(void) {
void SPI::spi_ftdi_select() {
#ifndef CLCD_USE_SOFT_SPI
::SPI.beginTransaction(spi_settings);
#endif
@ -115,7 +115,7 @@ namespace FTDI {
}
// CLCD SPI - Chip Deselect
void SPI::spi_ftdi_deselect(void) {
void SPI::spi_ftdi_deselect() {
WRITE(CLCD_SPI_CS, 1);
#ifndef CLCD_USE_SOFT_SPI
::SPI.endTransaction();
@ -142,7 +142,7 @@ namespace FTDI {
#endif
// Not really a SPI signal...
void SPI::ftdi_reset(void) {
void SPI::ftdi_reset() {
WRITE(CLCD_MOD_RESET, 0);
delay(6); /* minimum time for power-down is 5ms */
WRITE(CLCD_MOD_RESET, 1);
@ -150,7 +150,7 @@ namespace FTDI {
}
// Not really a SPI signal...
void SPI::test_pulse(void) {
void SPI::test_pulse() {
#ifdef CLCD_AUX_0
WRITE(CLCD_AUX_0, 1);
delayMicroseconds(10);

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/basic/spi.h
View File

@ -122,7 +122,7 @@ namespace FTDI {
void spi_read_bulk( void *data, uint16_t len);
bool spi_verify_bulk(const void *data, uint16_t len);
void ftdi_reset(void);
void test_pulse(void);
void ftdi_reset();
void test_pulse();
}
}

10
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/screen_types.h
View File

@ -54,11 +54,11 @@ typedef enum {
class ScreenRef {
protected:
typedef void onStartup_func_t(void);
typedef void onEntry_func_t(void);
typedef void onExit_func_t(void);
typedef void onIdle_func_t(void);
typedef void onRefresh_func_t(void);
typedef void onStartup_func_t();
typedef void onEntry_func_t();
typedef void onExit_func_t();
typedef void onIdle_func_t();
typedef void onRefresh_func_t();
typedef void onRedraw_func_t(draw_mode_t);
typedef bool onTouchStart_func_t(uint8_t);
typedef bool onTouchHeld_func_t(uint8_t);

2
Marlin/src/lcd/extensible_ui/ui_api.cpp
View File

@ -901,7 +901,7 @@ namespace ExtUI {
feedrate_percentage = clamp(value, 10, 500);
}
void setUserConfirmed(void) {
void setUserConfirmed() {
#if HAS_RESUME_CONTINUE
wait_for_user = false;
#endif

2
Marlin/src/lcd/extensible_ui/ui_api.h
View File

@ -165,7 +165,7 @@ namespace ExtUI {
void setRetractAcceleration_mm_s2(const float);
void setTravelAcceleration_mm_s2(const float);
void setFeedrate_percent(const float);
void setUserConfirmed(void);
void setUserConfirmed();
#if ENABLED(LIN_ADVANCE)
float getLinearAdvance_mm_mm_s(const extruder_t);

2
Marlin/src/lcd/lcdprint.h
View File

@ -22,7 +22,7 @@
#define START_OF_UTF8_CHAR(C) (((C) & 0xC0u) != 0x80u)
int lcd_glyph_height(void);
int lcd_glyph_height();
int lcd_put_wchar_max(wchar_t c, pixel_len_t max_length);

2
Marlin/src/lcd/ultralcd.cpp
View File

@ -1123,7 +1123,7 @@ void MarlinUI::update() {
ADC_BUTTON_VALUE(ADC_BUTTONS_MIDDLE_R_PULLDOWN) + 100, 1 + BLEN_KEYPAD_MIDDLE }, // ENTER (1205 ... 1405)
};
uint8_t get_ADC_keyValue(void) {
uint8_t get_ADC_keyValue() {
if (thermalManager.ADCKey_count >= 16) {
const uint16_t currentkpADCValue = thermalManager.current_ADCKey_raw << 2;
thermalManager.current_ADCKey_raw = 1024;