From a142fab155b60c382cbf25b6f01d791a6fe1388a Mon Sep 17 00:00:00 2001 From: Bob-the-Kuhn Date: Thu, 21 Dec 2017 12:05:25 -0600 Subject: [PATCH 1/3] Enable RRDFGSC on Due --- .../HAL_DUE/u8g_com_HAL_DUE_st7920_sw_spi.cpp | 212 ++++++++++++++ Marlin/src/lcd/dogm/HAL_LCD_class_defines.h | 8 - Marlin/src/lcd/dogm/HAL_LCD_com_defines.h | 9 +- .../lcd/dogm/u8g_dev_st7920_128_64_sw_spi.cpp | 276 ------------------ .../lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp | 2 +- .../dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp | 2 +- Marlin/src/lcd/ultralcd_impl_DOGM.h | 4 +- platformio.ini | 1 + 8 files changed, 223 insertions(+), 291 deletions(-) create mode 100644 Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_st7920_sw_spi.cpp delete mode 100644 Marlin/src/lcd/dogm/u8g_dev_st7920_128_64_sw_spi.cpp diff --git a/Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_st7920_sw_spi.cpp b/Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_st7920_sw_spi.cpp new file mode 100644 index 000000000..1de01fee9 --- /dev/null +++ b/Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_st7920_sw_spi.cpp @@ -0,0 +1,212 @@ +/** + * Marlin 3D Printer Firmware + * Copyright (C) 2016, 2017 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] + * + * 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 + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +/* + + based on u8g_com_st7920_hw_spi.c + + Universal 8bit Graphics Library + + Copyright (c) 2011, olikraus@gmail.com + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list + of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, this + list of conditions and the following disclaimer in the documentation and/or other + materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ + +#ifdef __SAM3X8E__ + + #include + #include + #include "../../core/macros.h" + + + void u8g_SetPIOutput_DUE(u8g_t *u8g, uint8_t pin_index) { + PIO_Configure(g_APinDescription[u8g->pin_list[pin_index]].pPort, PIO_OUTPUT_1, + g_APinDescription[u8g->pin_list[pin_index]].ulPin, g_APinDescription[u8g->pin_list[pin_index]].ulPinConfiguration); // OUTPUT + } + + + void u8g_SetPILevel_DUE(u8g_t *u8g, uint8_t pin_index, uint8_t level) { + volatile Pio* port = g_APinDescription[u8g->pin_list[pin_index]].pPort; + uint32_t mask = g_APinDescription[u8g->pin_list[pin_index]].ulPin; + if (level) port->PIO_SODR = mask; + else port->PIO_CODR = mask; + } + + +#define nop() __asm__ __volatile__("nop;\n\t":::) + +void __delay_4cycles(uint32_t cy) __attribute__ ((weak)); +FORCE_INLINE void __delay_4cycles(uint32_t cy) { // +1 cycle + #if ARCH_PIPELINE_RELOAD_CYCLES<2 + #define EXTRA_NOP_CYCLES "nop" + #else + #define EXTRA_NOP_CYCLES "" + #endif + + __asm__ __volatile__( + ".syntax unified" "\n\t" // is to prevent CM0,CM1 non-unified syntax + + "loop%=:" "\n\t" + " subs %[cnt],#1" "\n\t" + EXTRA_NOP_CYCLES "\n\t" + " bne loop%=" "\n\t" + : [cnt]"+r"(cy) // output: +r means input+output + : // input: + : "cc" // clobbers: + ); +} + + Pio *SCK_pPio, *MOSI_pPio; + uint32_t SCK_dwMask, MOSI_dwMask; + + static void spiSend_sw_DUE(uint8_t val) // 800KHz + { + for (uint8_t i = 0; i < 8; i++) { + if (val & 0x80) + MOSI_pPio->PIO_SODR = MOSI_dwMask; + else + MOSI_pPio->PIO_CODR = MOSI_dwMask; + val = val << 1; + __delay_4cycles(2); + SCK_pPio->PIO_SODR = SCK_dwMask; + __delay_4cycles(22); + SCK_pPio->PIO_CODR = SCK_dwMask; + } + } + + static uint8_t rs_last_state = 255; + + static void u8g_com_DUE_st7920_write_byte_sw_spi(uint8_t rs, uint8_t val) + { + uint8_t i; + + if ( rs != rs_last_state) { // time to send a command/data byte + rs_last_state = rs; + + if ( rs == 0 ) + /* command */ + spiSend_sw_DUE(0x0f8); + else + /* data */ + spiSend_sw_DUE(0x0fa); + + for( i = 0; i < 4; i++ ) // give the controller some time to process the data + u8g_10MicroDelay(); // 2 is bad, 3 is OK, 4 is safe + } + + spiSend_sw_DUE(val & 0x0f0); + spiSend_sw_DUE(val << 4); + } + + + uint8_t u8g_com_HAL_DUE_ST7920_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) + { + switch(msg) + { + case U8G_COM_MSG_INIT: + SCK_pPio = g_APinDescription[u8g->pin_list[U8G_PI_SCK]].pPort; + SCK_dwMask = g_APinDescription[u8g->pin_list[U8G_PI_SCK]].ulPin; + MOSI_pPio = g_APinDescription[u8g->pin_list[U8G_PI_MOSI]].pPort; + MOSI_dwMask = g_APinDescription[u8g->pin_list[U8G_PI_MOSI]].ulPin; + + u8g_SetPILevel_DUE(u8g, U8G_PI_CS, 0); + u8g_SetPIOutput_DUE(u8g, U8G_PI_CS); + u8g_SetPILevel_DUE(u8g, U8G_PI_SCK, 0); + u8g_SetPIOutput_DUE(u8g, U8G_PI_SCK); + u8g_SetPILevel_DUE(u8g, U8G_PI_MOSI, 0); + u8g_SetPILevel_DUE(u8g, U8G_PI_MOSI, 1); + u8g_SetPIOutput_DUE(u8g, U8G_PI_MOSI); + u8g_Delay(5); + u8g->pin_list[U8G_PI_A0_STATE] = 0; /* inital RS state: command mode */ + break; + + case U8G_COM_MSG_STOP: + break; + + case U8G_COM_MSG_RESET: + if (U8G_PIN_NONE != u8g->pin_list[U8G_PI_RESET]) u8g_SetPILevel_DUE(u8g, U8G_PI_RESET, arg_val); + break; + + case U8G_COM_MSG_ADDRESS: /* define cmd (arg_val = 0) or data mode (arg_val = 1) */ + u8g->pin_list[U8G_PI_A0_STATE] = arg_val; + break; + + case U8G_COM_MSG_CHIP_SELECT: + if (U8G_PIN_NONE != u8g->pin_list[U8G_PI_CS]) + u8g_SetPILevel_DUE(u8g, U8G_PI_CS, arg_val); //note: the st7920 has an active high chip select + break; + + case U8G_COM_MSG_WRITE_BYTE: + + u8g_com_DUE_st7920_write_byte_sw_spi(u8g->pin_list[U8G_PI_A0_STATE], arg_val); + break; + + case U8G_COM_MSG_WRITE_SEQ: + { + uint8_t *ptr = (uint8_t*) arg_ptr; + while( arg_val > 0 ) + { + u8g_com_DUE_st7920_write_byte_sw_spi(u8g->pin_list[U8G_PI_A0_STATE], *ptr++); + arg_val--; + } + } + break; + + case U8G_COM_MSG_WRITE_SEQ_P: + { + uint8_t *ptr = (uint8_t*) arg_ptr; + while( arg_val > 0 ) + { + u8g_com_DUE_st7920_write_byte_sw_spi(u8g->pin_list[U8G_PI_A0_STATE], *ptr++); + arg_val--; + } + } + break; + } + return 1; + } +#pragma GCC reset_options +#endif //ARDUINO_ARCH_SAM diff --git a/Marlin/src/lcd/dogm/HAL_LCD_class_defines.h b/Marlin/src/lcd/dogm/HAL_LCD_class_defines.h index a2fdc6fab..33666d33f 100644 --- a/Marlin/src/lcd/dogm/HAL_LCD_class_defines.h +++ b/Marlin/src/lcd/dogm/HAL_LCD_class_defines.h @@ -62,14 +62,6 @@ class U8GLIB_ST7920_128X64_RRD : public U8GLIB }; -extern u8g_dev_t u8g_dev_st7920_128x64_custom_sw_spi; -class U8GLIB_ST7920_128X64_CUSTOM_SW_SPI : public U8GLIB { - public: - U8GLIB_ST7920_128X64_CUSTOM_SW_SPI() - : U8GLIB(&u8g_dev_st7920_128x64_custom_sw_spi) - { } -}; - extern u8g_dev_t u8g_dev_sh1106_128x64_2x_i2c_2_wire; class U8GLIB_SH1106_128X64_2X_I2C_2_WIRE : public U8GLIB { public: diff --git a/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h b/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h index 7811f5034..e2a90a439 100644 --- a/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h +++ b/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h @@ -31,8 +31,13 @@ uint8_t u8g_com_arduino_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr); #define U8G_COM_HAL_HW_SPI_FN u8g_com_arduino_hw_spi_fn - uint8_t u8g_com_arduino_st7920_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr); - #define U8G_COM_ST7920_HAL_SW_SPI u8g_com_arduino_st7920_spi_fn + #ifdef __SAM3X8E__ + uint8_t u8g_com_HAL_DUE_ST7920_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr); + #define U8G_COM_ST7920_HAL_SW_SPI u8g_com_HAL_DUE_ST7920_sw_spi_fn + #else + uint8_t u8g_com_arduino_st7920_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr); + #define U8G_COM_ST7920_HAL_SW_SPI u8g_com_arduino_st7920_spi_fn + #endif uint8_t u8g_com_arduino_st7920_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr); #define U8G_COM_ST7920_HAL_HW_SPI u8g_com_arduino_st7920_hw_spi_fn diff --git a/Marlin/src/lcd/dogm/u8g_dev_st7920_128_64_sw_spi.cpp b/Marlin/src/lcd/dogm/u8g_dev_st7920_128_64_sw_spi.cpp deleted file mode 100644 index 0fccba9ce..000000000 --- a/Marlin/src/lcd/dogm/u8g_dev_st7920_128_64_sw_spi.cpp +++ /dev/null @@ -1,276 +0,0 @@ -/** - * Marlin 3D Printer Firmware - * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] - * - * 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 - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/* - * PLEASE NOTE >>> - * We need our custom implementation for Software SPI, as the default implementation - * of U8GLIB, when running in an ARM based board, is too fast and the display will not - * recognize commands and/or data at such speeds. This implementation autoderives the - * required delays to get the maximum possible performance by using the F_CPU macro that - * specifies the CPU speed. According to the ST7920 datasheet, the maximum SCLK is 1MHz. - */ - -#ifndef ULCDST7920_SWSPI_H -#define ULCDST7920_SWSPI_H - -#include "../../inc/MarlinConfig.h" - -#if ENABLED(U8GLIB_ST7920) - -#include -#include "HAL_LCD_com_defines.h" - -#define ST7920_CLK_PIN LCD_PINS_D4 -#define ST7920_DAT_PIN LCD_PINS_ENABLE -#define ST7920_CS_PIN LCD_PINS_RS - -//#define PAGE_HEIGHT 8 //128 byte framebuffer -#define PAGE_HEIGHT 16 //256 byte framebuffer -//#define PAGE_HEIGHT 32 //512 byte framebuffer - -#define LCD_PIXEL_WIDTH 128 -#define LCD_PIXEL_HEIGHT 64 - -//set optimization so ARDUINO optimizes this file -#pragma GCC optimize (3) - -/* ---------------- Delay Cycles routine -------------- */ - -#ifdef __arm__ -/* https://blueprints.launchpad.net/gcc-arm-embedded/+spec/delay-cycles */ - -#define nop() __asm__ __volatile__("nop;\n\t":::) - -FORCE_INLINE static void __delay_4cycles(uint32_t cy) { // +1 cycle - #if ARCH_PIPELINE_RELOAD_CYCLES<2 - #define EXTRA_NOP_CYCLES "nop" - #else - #define EXTRA_NOP_CYCLES "" - #endif - - __asm__ __volatile__( - ".syntax unified" "\n\t" // is to prevent CM0,CM1 non-unified syntax - - "loop%=:" "\n\t" - " subs %[cnt],#1" "\n\t" - EXTRA_NOP_CYCLES "\n\t" - " bne loop%=" "\n\t" - : [cnt]"+r"(cy) // output: +r means input+output - : // input: - : "cc" // clobbers: - ); -} - -FORCE_INLINE static void DELAY_CYCLES(uint32_t x) { - - if (__builtin_constant_p(x)) { - - #define MAXNOPS 4 - - if (x <= (MAXNOPS)) { - switch(x) { case 4: nop(); case 3: nop(); case 2: nop(); case 1: nop(); } - } - else { // because of +1 cycle inside delay_4cycles - const uint32_t rem = (x - 1) % (MAXNOPS); - switch(rem) { case 3: nop(); case 2: nop(); case 1: nop(); } - if ((x = (x - 1) / (MAXNOPS))) - __delay_4cycles(x); // if need more then 4 nop loop is more optimal - } - } - else - __delay_4cycles(x / 4); - } - -#ifdef __TEST_DELAY - - void calibrateTimer() { - - // Use DWT to calibrate cycles - uint32_t count = 0; - - // addresses of registers - volatile uint32_t *DWT_CONTROL = (uint32_t *)0xE0001000, - *DWT_CYCCNT = (uint32_t *)0xE0001004, - *DEMCR = (uint32_t *)0xE000EDFC; - - cli(); - - // enable the use DWT - *DEMCR = *DEMCR | 0x01000000; - - // Reset cycle counter - *DWT_CYCCNT = 0; - - // enable cycle counter - *DWT_CONTROL = *DWT_CONTROL | 1; - - // Perform a delay of 10000 cycles - DELAY_CYCLES(10000U); - - // number of cycles stored in count variable - count = *DWT_CYCCNT; - - sei(); - - SERIAL_ECHO_START(); - SERIAL_ECHOLNPAIR("calibrated Cycles: ", (int)count); - } - -#endif // __TEST_DELAY - -#elif defined(__AVR__) - #define DELAY_CYCLES(cycles) __builtin_avr_delay_cycles(cycles) -#else - #error "DELAY_CYCLES not implemented for this architecture." -#endif - -/* ---------------- Delay in nanoseconds and in microseconds */ - -#define DELAY_NS(x) DELAY_CYCLES( (x) * (F_CPU/1000000) / 1000) -#define DELAY_US(x) DELAY_CYCLES( (x) * (F_CPU/1000000)) - -/* ---------------- ST7920 commands ------------------------ */ - -#ifdef __arm__ - - /* ARM: Plain implementation is more than enough */ - static void ST7920_SWSPI_SND_8BIT(uint8_t val) { - uint8_t n = 8; - do { - WRITE(ST7920_CLK_PIN, LOW); - WRITE(ST7920_DAT_PIN, val & 0x80); - DELAY_NS(700); /* RE-ARM requires 700ns to be stable, RAMPS4DUE works with 500ns */ - WRITE(ST7920_CLK_PIN, HIGH); - DELAY_NS(700); /* RE-ARM requires 700ns to be stable, RAMPS4DUE works with 500ns */ - val <<= 1; - } while (--n); - } - -#else // !ARM - - /* AVR: Unrolling loop makes sense */ - #define ST7920_SND_BIT(nr) \ - WRITE(ST7920_CLK_PIN, LOW); \ - WRITE(ST7920_DAT_PIN, TEST(val, nr)); \ - DELAY_NS(700); \ - WRITE(ST7920_CLK_PIN, HIGH); \ - DELAY_NS(700); - - static void ST7920_SWSPI_SND_8BIT(const uint8_t val) { - ST7920_SND_BIT(7); // MSBit - ST7920_SND_BIT(6); // - ST7920_SND_BIT(5); // - ST7920_SND_BIT(4); // - ST7920_SND_BIT(3); // - ST7920_SND_BIT(2); // - ST7920_SND_BIT(1); // - ST7920_SND_BIT(0); // LSBit - } - -#endif // !ARM - -#define ST7920_CS() { WRITE(ST7920_CS_PIN,1); DELAY_NS(200); } -#define ST7920_NCS() { WRITE(ST7920_CS_PIN,0); } -#define ST7920_SET_CMD() { ST7920_SWSPI_SND_8BIT(0xF8); DELAY_US(3); } -#define ST7920_SET_DAT() { ST7920_SWSPI_SND_8BIT(0xFA); DELAY_US(3); } -#define ST7920_WRITE_BYTE(a) { ST7920_SWSPI_SND_8BIT((uint8_t)((a)&0xF0u)); ST7920_SWSPI_SND_8BIT((uint8_t)((a)<<4u)); DELAY_US(3); } -#define ST7920_WRITE_BYTES(p,l) { for (uint8_t i = l + 1; --i;) { ST7920_SWSPI_SND_8BIT(*p&0xF0); ST7920_SWSPI_SND_8BIT(*p<<4); p++; } DELAY_US(3); } - - -uint8_t u8g_dev_st7920_custom_sw_spi_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t msg, void *arg) { - - uint8_t i, y; - switch (msg) { - case U8G_DEV_MSG_INIT: { - - /* Set to output and write */ - OUT_WRITE(ST7920_CS_PIN, LOW); - OUT_WRITE(ST7920_DAT_PIN, LOW); - OUT_WRITE(ST7920_CLK_PIN, HIGH); - - ST7920_CS(); - u8g_Delay(120); //initial delay for boot up - - ST7920_SET_CMD(); - ST7920_WRITE_BYTE(0x08); //display off, cursor+blink off - ST7920_WRITE_BYTE(0x01); //clear CGRAM ram - u8g_Delay(15); //delay for CGRAM clear - ST7920_WRITE_BYTE(0x3E); //extended mode + GDRAM active - for (y = 0; y < (LCD_PIXEL_HEIGHT) / 2; y++) { //clear GDRAM - ST7920_WRITE_BYTE(0x80 | y); //set y - ST7920_WRITE_BYTE(0x80); //set x = 0 - ST7920_SET_DAT(); - for (i = 0; i < 2 * (LCD_PIXEL_WIDTH) / 8; i++) //2x width clears both segments - ST7920_WRITE_BYTE(0); - ST7920_SET_CMD(); - } - - ST7920_WRITE_BYTE(0x0C); //display on, cursor+blink off - ST7920_NCS(); - } - break; - - case U8G_DEV_MSG_STOP: - break; - - case U8G_DEV_MSG_PAGE_NEXT: { - u8g_pb_t* pb = (u8g_pb_t*)(dev->dev_mem); - y = pb->p.page_y0; - uint8_t* ptr = (uint8_t*)pb->buf; - - ST7920_CS(); - for (i = 0; i < PAGE_HEIGHT; i ++) { - ST7920_SET_CMD(); - if (y < 32) { - ST7920_WRITE_BYTE(0x80 | y); //y - ST7920_WRITE_BYTE(0x80); //x=0 - } - else { - ST7920_WRITE_BYTE(0x80 | (y - 32)); //y - ST7920_WRITE_BYTE(0x80 | 8); //x=64 - } - ST7920_SET_DAT(); - ST7920_WRITE_BYTES(ptr, (LCD_PIXEL_WIDTH) / 8); //ptr is incremented inside of macro - y++; - } - - ST7920_NCS(); - } - break; - } - #if PAGE_HEIGHT == 8 - return u8g_dev_pb8h1_base_fn(u8g, dev, msg, arg); - #elif PAGE_HEIGHT == 16 - return u8g_dev_pb16h1_base_fn(u8g, dev, msg, arg); - #else - return u8g_dev_pb32h1_base_fn(u8g, dev, msg, arg); - #endif -} - -static uint8_t u8g_dev_st7920_128x64_custom_sw_spi_buf[(LCD_PIXEL_WIDTH) * (PAGE_HEIGHT) / 8] U8G_NOCOMMON; -static u8g_pb_t u8g_dev_st7920_128x64_custom_sw_spi_pb = {{PAGE_HEIGHT, LCD_PIXEL_HEIGHT, 0, 0, 0}, LCD_PIXEL_WIDTH, u8g_dev_st7920_128x64_custom_sw_spi_buf}; -u8g_dev_t u8g_dev_st7920_128x64_custom_sw_spi = {u8g_dev_st7920_custom_sw_spi_128x64_fn, &u8g_dev_st7920_128x64_custom_sw_spi_pb, &u8g_com_null_fn}; - -#pragma GCC reset_options - -#endif // U8GLIB_ST7920 -#endif // ULCDST7920_SWSPI_H diff --git a/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp b/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp index baafc2c43..a4963e040 100644 --- a/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp +++ b/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp @@ -199,7 +199,7 @@ U8G_PB_DEV(u8g_dev_st7920_128x64_HAL_hw_spi, WIDTH, HEIGHT, PAGE_HEIGHT, u8g_dev u8g_dev_t u8g_dev_st7920_128x64_HAL_4x_hw_spi = { u8g_dev_st7920_128x64_HAL_4x_fn, &u8g_dev_st7920_128x64_HAL_4x_pb, U8G_COM_ST7920_HAL_HW_SPI }; -#ifdef U8G_HAL_LINKS +#if defined(U8G_HAL_LINKS) || defined(__SAM3X8E__) // Also use this device for HAL version of rrd class. This results in the same device being used // for the ST7920 for HAL systems no matter what is selected in ultralcd_impl_DOGM.h. u8g_dev_t u8g_dev_st7920_128x64_rrd_sw_spi = { u8g_dev_st7920_128x64_HAL_4x_fn, &u8g_dev_st7920_128x64_HAL_4x_pb, U8G_COM_ST7920_HAL_SW_SPI }; diff --git a/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp b/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp index 5c61665d5..bdab2efa8 100644 --- a/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp +++ b/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp @@ -27,7 +27,7 @@ #if ENABLED(U8GLIB_ST7920) -#ifndef U8G_HAL_LINKS +#if !(defined(U8G_HAL_LINKS) || defined(__SAM3X8E__)) #define ST7920_CLK_PIN LCD_PINS_D4 #define ST7920_DAT_PIN LCD_PINS_ENABLE diff --git a/Marlin/src/lcd/ultralcd_impl_DOGM.h b/Marlin/src/lcd/ultralcd_impl_DOGM.h index 05ebcc9f1..27cfc8d4f 100644 --- a/Marlin/src/lcd/ultralcd_impl_DOGM.h +++ b/Marlin/src/lcd/ultralcd_impl_DOGM.h @@ -169,9 +169,6 @@ #else U8GLIB_ST7920_128X64_4X u8g(LCD_PINS_RS); // 2 stripes, HW SPI (shared with SD card) #endif -#elif ENABLED(U8GLIB_ST7920) && defined(__arm__) - // RepRap Discount Full Graphics Smart Controller on an ARM target - U8GLIB_ST7920_128X64_CUSTOM_SW_SPI u8g; #elif ENABLED(U8GLIB_ST7920) // RepRap Discount Full Graphics Smart Controller @@ -190,6 +187,7 @@ // Based on the Adafruit ST7565 (http://www.adafruit.com/products/250) //U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0); // 8 stripes U8GLIB_LM6059_2X u8g(DOGLCD_CS, DOGLCD_A0); // 4 stripes + #elif ENABLED(U8GLIB_ST7565_64128N) // The MaKrPanel, Mini Viki, and Viki 2.0, ST7565 controller //U8GLIB_64128N_2X_HAL u8g(DOGLCD_CS, DOGLCD_A0); // using HW-SPI diff --git a/platformio.ini b/platformio.ini index 01f3bdb11..decdd959d 100644 --- a/platformio.ini +++ b/platformio.ini @@ -95,6 +95,7 @@ framework = arduino board = due build_flags = ${common.build_flags} -I $BUILDSRC_DIR lib_deps = ${common.lib_deps} +lib_ignore = TMC26XStepper src_filter = ${common.default_src_filter} # From 1a827d5b6832743bea273948bf3d7c13039a2b97 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 25 Dec 2017 09:29:41 -0600 Subject: [PATCH 2/3] Opening brace tweaks --- .../HAL_DUE/u8g_com_HAL_DUE_st7920_sw_spi.cpp | 29 +++++++------------ .../u8g_com_HAL_LPC1768_hw_spi.cpp | 12 +++----- .../u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp | 6 ++-- ...LPC1768_ssd_sw_i2c.cpp under construction | 6 ++-- .../u8g_com_HAL_LPC1768_st7920_hw_spi.cpp | 12 +++----- .../u8g_com_HAL_LPC1768_st7920_sw_spi.cpp | 12 +++----- .../u8g_com_HAL_LPC1768_sw_spi.cpp | 12 +++----- Marlin/src/gcode/feature/trinamic/M122.cpp | 9 ++---- .../u8g_dev_ssd1306_sh1106_128x64_I2C.cpp | 6 ++-- .../lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp | 6 ++-- .../lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp | 6 ++-- 11 files changed, 39 insertions(+), 77 deletions(-) diff --git a/Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_st7920_sw_spi.cpp b/Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_st7920_sw_spi.cpp index 1de01fee9..557165296 100644 --- a/Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_st7920_sw_spi.cpp +++ b/Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_st7920_sw_spi.cpp @@ -61,13 +61,11 @@ #include #include "../../core/macros.h" - void u8g_SetPIOutput_DUE(u8g_t *u8g, uint8_t pin_index) { PIO_Configure(g_APinDescription[u8g->pin_list[pin_index]].pPort, PIO_OUTPUT_1, g_APinDescription[u8g->pin_list[pin_index]].ulPin, g_APinDescription[u8g->pin_list[pin_index]].ulPinConfiguration); // OUTPUT } - void u8g_SetPILevel_DUE(u8g_t *u8g, uint8_t pin_index, uint8_t level) { volatile Pio* port = g_APinDescription[u8g->pin_list[pin_index]].pPort; uint32_t mask = g_APinDescription[u8g->pin_list[pin_index]].ulPin; @@ -75,7 +73,6 @@ else port->PIO_CODR = mask; } - #define nop() __asm__ __volatile__("nop;\n\t":::) void __delay_4cycles(uint32_t cy) __attribute__ ((weak)); @@ -102,8 +99,7 @@ FORCE_INLINE void __delay_4cycles(uint32_t cy) { // +1 cycle Pio *SCK_pPio, *MOSI_pPio; uint32_t SCK_dwMask, MOSI_dwMask; - static void spiSend_sw_DUE(uint8_t val) // 800KHz - { + static void spiSend_sw_DUE(uint8_t val) { // 800KHz for (uint8_t i = 0; i < 8; i++) { if (val & 0x80) MOSI_pPio->PIO_SODR = MOSI_dwMask; @@ -119,8 +115,7 @@ FORCE_INLINE void __delay_4cycles(uint32_t cy) { // +1 cycle static uint8_t rs_last_state = 255; - static void u8g_com_DUE_st7920_write_byte_sw_spi(uint8_t rs, uint8_t val) - { + static void u8g_com_DUE_st7920_write_byte_sw_spi(uint8_t rs, uint8_t val) { uint8_t i; if ( rs != rs_last_state) { // time to send a command/data byte @@ -142,10 +137,8 @@ FORCE_INLINE void __delay_4cycles(uint32_t cy) { // +1 cycle } - uint8_t u8g_com_HAL_DUE_ST7920_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) - { - switch(msg) - { + uint8_t u8g_com_HAL_DUE_ST7920_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) { + switch (msg) { case U8G_COM_MSG_INIT: SCK_pPio = g_APinDescription[u8g->pin_list[U8G_PI_SCK]].pPort; SCK_dwMask = g_APinDescription[u8g->pin_list[U8G_PI_SCK]].ulPin; @@ -184,22 +177,18 @@ FORCE_INLINE void __delay_4cycles(uint32_t cy) { // +1 cycle u8g_com_DUE_st7920_write_byte_sw_spi(u8g->pin_list[U8G_PI_A0_STATE], arg_val); break; - case U8G_COM_MSG_WRITE_SEQ: - { + case U8G_COM_MSG_WRITE_SEQ: { uint8_t *ptr = (uint8_t*) arg_ptr; - while( arg_val > 0 ) - { + while (arg_val > 0) { u8g_com_DUE_st7920_write_byte_sw_spi(u8g->pin_list[U8G_PI_A0_STATE], *ptr++); arg_val--; } } break; - case U8G_COM_MSG_WRITE_SEQ_P: - { + case U8G_COM_MSG_WRITE_SEQ_P: { uint8_t *ptr = (uint8_t*) arg_ptr; - while( arg_val > 0 ) - { + while (arg_val > 0) { u8g_com_DUE_st7920_write_byte_sw_spi(u8g->pin_list[U8G_PI_A0_STATE], *ptr++); arg_val--; } @@ -208,5 +197,7 @@ FORCE_INLINE void __delay_4cycles(uint32_t cy) { // +1 cycle } return 1; } + #pragma GCC reset_options + #endif //ARDUINO_ARCH_SAM diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_hw_spi.cpp b/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_hw_spi.cpp index c7771eeb3..53a4f3454 100644 --- a/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_hw_spi.cpp +++ b/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_hw_spi.cpp @@ -118,22 +118,18 @@ spiSend((uint8_t)arg_val); break; - case U8G_COM_MSG_WRITE_SEQ: - { + case U8G_COM_MSG_WRITE_SEQ: { uint8_t *ptr = (uint8_t*) arg_ptr; - while( arg_val > 0 ) - { + while (arg_val > 0) { spiSend(*ptr++); arg_val--; } } break; - case U8G_COM_MSG_WRITE_SEQ_P: - { + case U8G_COM_MSG_WRITE_SEQ_P: { uint8_t *ptr = (uint8_t*) arg_ptr; - while( arg_val > 0 ) - { + while (arg_val > 0) { spiSend(*ptr++); arg_val--; } diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp b/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp index 514bfa587..483b68837 100644 --- a/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp +++ b/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp @@ -160,8 +160,7 @@ return u8g_i2c_stop(), 0; { register uint8_t *ptr = (uint8_t *)arg_ptr; - while( arg_val > 0 ) - { + while (arg_val > 0) { if ( u8g_i2c_send_byte(*ptr++) == 0 ) return u8g_i2c_stop(), 0; arg_val--; @@ -176,8 +175,7 @@ return u8g_i2c_stop(), 0; { register uint8_t *ptr = (uint8_t *)arg_ptr; - while( arg_val > 0 ) - { + while (arg_val > 0) { if ( u8g_i2c_send_byte(u8g_pgm_read(ptr)) == 0 ) return 0; ptr++; diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_ssd_sw_i2c.cpp under construction b/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_ssd_sw_i2c.cpp under construction index 876c8db7a..8a048630e 100644 --- a/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_ssd_sw_i2c.cpp under construction +++ b/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_ssd_sw_i2c.cpp under construction @@ -239,8 +239,7 @@ void u8g_i2c_init_sw(uint8_t clock_option) { return u8g_i2c_stop_sw(), 0; { register uint8_t *ptr = (uint8_t *)arg_ptr; - while( arg_val > 0 ) - { + while (arg_val > 0) { if ( u8g_i2c_send_byte_sw(*ptr++) == 0 ) return u8g_i2c_stop_sw(), 0; arg_val--; @@ -255,8 +254,7 @@ void u8g_i2c_init_sw(uint8_t clock_option) { return u8g_i2c_stop_sw(), 0; { register uint8_t *ptr = (uint8_t *)arg_ptr; - while( arg_val > 0 ) - { + while (arg_val > 0) { if ( u8g_i2c_send_byte_sw(u8g_pgm_read(ptr)) == 0 ) return 0; ptr++; diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp b/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp index f07dbef16..dbec34f94 100644 --- a/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp +++ b/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp @@ -136,22 +136,18 @@ u8g_com_LPC1768_st7920_write_byte_hw_spi(u8g->pin_list[U8G_PI_A0_STATE], arg_val); break; - case U8G_COM_MSG_WRITE_SEQ: - { + case U8G_COM_MSG_WRITE_SEQ: { uint8_t *ptr = (uint8_t*) arg_ptr; - while( arg_val > 0 ) - { + while (arg_val > 0) { u8g_com_LPC1768_st7920_write_byte_hw_spi(u8g->pin_list[U8G_PI_A0_STATE], *ptr++); arg_val--; } } break; - case U8G_COM_MSG_WRITE_SEQ_P: - { + case U8G_COM_MSG_WRITE_SEQ_P: { uint8_t *ptr = (uint8_t*) arg_ptr; - while( arg_val > 0 ) - { + while (arg_val > 0) { u8g_com_LPC1768_st7920_write_byte_hw_spi(u8g->pin_list[U8G_PI_A0_STATE], *ptr++); arg_val--; } diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp b/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp index 0f861c96b..8f7236e17 100644 --- a/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp +++ b/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp @@ -170,22 +170,18 @@ u8g_com_LPC1768_st7920_write_byte_sw_spi(u8g->pin_list[U8G_PI_A0_STATE], arg_val); break; - case U8G_COM_MSG_WRITE_SEQ: - { + case U8G_COM_MSG_WRITE_SEQ: { uint8_t *ptr = (uint8_t*) arg_ptr; - while( arg_val > 0 ) - { + while (arg_val > 0) { u8g_com_LPC1768_st7920_write_byte_sw_spi(u8g->pin_list[U8G_PI_A0_STATE], *ptr++); arg_val--; } } break; - case U8G_COM_MSG_WRITE_SEQ_P: - { + case U8G_COM_MSG_WRITE_SEQ_P: { uint8_t *ptr = (uint8_t*) arg_ptr; - while( arg_val > 0 ) - { + while (arg_val > 0) { u8g_com_LPC1768_st7920_write_byte_sw_spi(u8g->pin_list[U8G_PI_A0_STATE], *ptr++); arg_val--; } diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_sw_spi.cpp b/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_sw_spi.cpp index 88601adcd..6e6ba7b39 100644 --- a/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_sw_spi.cpp +++ b/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_sw_spi.cpp @@ -150,22 +150,18 @@ uint8_t u8g_com_HAL_LPC1768_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, u8g_sw_spi_HAL_LPC1768_shift_out(u8g->pin_list[U8G_PI_MOSI], u8g->pin_list[U8G_PI_SCK], arg_val); break; - case U8G_COM_MSG_WRITE_SEQ: - { + case U8G_COM_MSG_WRITE_SEQ: { uint8_t *ptr = (uint8_t *)arg_ptr; - while( arg_val > 0 ) - { + while (arg_val > 0) { u8g_sw_spi_HAL_LPC1768_shift_out(u8g->pin_list[U8G_PI_MOSI], u8g->pin_list[U8G_PI_SCK], *ptr++); arg_val--; } } break; - case U8G_COM_MSG_WRITE_SEQ_P: - { + case U8G_COM_MSG_WRITE_SEQ_P: { uint8_t *ptr = (uint8_t *)arg_ptr; - while( arg_val > 0 ) - { + while (arg_val > 0) { u8g_sw_spi_HAL_LPC1768_shift_out(u8g->pin_list[U8G_PI_MOSI], u8g->pin_list[U8G_PI_SCK], u8g_pgm_read(ptr)); ptr++; arg_val--; diff --git a/Marlin/src/gcode/feature/trinamic/M122.cpp b/Marlin/src/gcode/feature/trinamic/M122.cpp index 0302a8d63..f566ba881 100644 --- a/Marlin/src/gcode/feature/trinamic/M122.cpp +++ b/Marlin/src/gcode/feature/trinamic/M122.cpp @@ -110,8 +110,7 @@ static void drv_status_print_hex(const char name[], const uint32_t drv_status) { #if ENABLED(HAVE_TMC2208) static void tmc_status(TMC2208Stepper &st, const TMC_debug_enum i) { switch(i) { - case TMC_TSTEP: - { + case TMC_TSTEP: { uint32_t data = 0; st.TSTEP(&data); MYSERIAL.print(data); @@ -159,14 +158,12 @@ static void tmc_status(TMC &st, TMC_AxisEnum axis, const TMC_debug_enum i, const case TMC_VSENSE: serialprintPGM(st.vsense() ? PSTR("1=.18") : PSTR("0=.325")); break; case TMC_MICROSTEPS: SERIAL_ECHO(st.microsteps()); break; - case TMC_TPWMTHRS: - { + case TMC_TPWMTHRS: { uint32_t tpwmthrs_val = st.TPWMTHRS(); SERIAL_ECHO(tpwmthrs_val); } break; - case TMC_TPWMTHRS_MMS: - { + case TMC_TPWMTHRS_MMS: { uint32_t tpwmthrs_val = st.TPWMTHRS(); tpwmthrs_val ? SERIAL_ECHO(12650000UL * st.microsteps() / (256 * tpwmthrs_val * spmm)) : SERIAL_ECHO('-'); } diff --git a/Marlin/src/lcd/dogm/u8g_dev_ssd1306_sh1106_128x64_I2C.cpp b/Marlin/src/lcd/dogm/u8g_dev_ssd1306_sh1106_128x64_I2C.cpp index 040d19541..efec51a72 100644 --- a/Marlin/src/lcd/dogm/u8g_dev_ssd1306_sh1106_128x64_I2C.cpp +++ b/Marlin/src/lcd/dogm/u8g_dev_ssd1306_sh1106_128x64_I2C.cpp @@ -128,8 +128,7 @@ uint8_t u8g_dev_sh1106_128x64_2x_2_wire_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t m break; case U8G_DEV_MSG_STOP: break; - case U8G_DEV_MSG_PAGE_NEXT: - { + case U8G_DEV_MSG_PAGE_NEXT: { u8g_pb_t *pb = (u8g_pb_t *)(dev->dev_mem); u8g_SetAddress(u8g, dev, 0); // instruction mode u8g_WriteEscSeqP_2_wire(u8g, dev, u8g_dev_sh1106_128x64_data_start_2_wire); @@ -202,8 +201,7 @@ uint8_t u8g_dev_ssd1306_128x64_2x_2_wire_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t break; case U8G_DEV_MSG_STOP: break; - case U8G_DEV_MSG_PAGE_NEXT: - { + case U8G_DEV_MSG_PAGE_NEXT: { u8g_pb_t *pb = (u8g_pb_t *)(dev->dev_mem); u8g_SetAddress(u8g, dev, 0); // instruction mode u8g_WriteEscSeqP_2_wire(u8g, dev, u8g_dev_ssd1306_128x64_data_start_2_wire); diff --git a/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp b/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp index 891db0077..491efbb49 100644 --- a/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp +++ b/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp @@ -149,8 +149,7 @@ uint8_t u8g_dev_st7565_64128n_HAL_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t msg, vo break; case U8G_DEV_MSG_STOP: break; - case U8G_DEV_MSG_PAGE_NEXT: - { + case U8G_DEV_MSG_PAGE_NEXT: { u8g_pb_t *pb = (u8g_pb_t *)(dev->dev_mem); u8g_WriteEscSeqP(u8g, dev, u8g_dev_st7565_64128n_HAL_data_start); u8g_WriteByte(u8g, dev, 0x0b0 | pb->p.page); /* select current page (ST7565R) */ @@ -187,8 +186,7 @@ uint8_t u8g_dev_st7565_64128n_HAL_2x_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t msg, break; case U8G_DEV_MSG_STOP: break; - case U8G_DEV_MSG_PAGE_NEXT: - { + case U8G_DEV_MSG_PAGE_NEXT: { u8g_pb_t *pb = (u8g_pb_t *)(dev->dev_mem); u8g_WriteEscSeqP(u8g, dev, u8g_dev_st7565_64128n_HAL_data_start); diff --git a/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp b/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp index a4963e040..deec8b215 100644 --- a/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp +++ b/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp @@ -99,8 +99,7 @@ uint8_t u8g_dev_st7920_128x64_HAL_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t msg, vo break; case U8G_DEV_MSG_STOP: break; - case U8G_DEV_MSG_PAGE_NEXT: - { + case U8G_DEV_MSG_PAGE_NEXT: { uint8_t y, i; uint8_t *ptr; u8g_pb_t *pb = (u8g_pb_t *)(dev->dev_mem); @@ -149,8 +148,7 @@ uint8_t u8g_dev_st7920_128x64_HAL_4x_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t msg, case U8G_DEV_MSG_STOP: break; - case U8G_DEV_MSG_PAGE_NEXT: - { + case U8G_DEV_MSG_PAGE_NEXT: { uint8_t y, i; uint8_t *ptr; u8g_pb_t *pb = (u8g_pb_t *)(dev->dev_mem); From 2c4e03d2cf33f82c923259a5288541764bd6e8e6 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 25 Dec 2017 09:34:33 -0600 Subject: [PATCH 3/3] Indentation of a SW SPI file --- .../HAL_DUE/u8g_com_HAL_DUE_st7920_sw_spi.cpp | 195 +++++++++--------- 1 file changed, 98 insertions(+), 97 deletions(-) diff --git a/Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_st7920_sw_spi.cpp b/Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_st7920_sw_spi.cpp index 557165296..26c2ac1d2 100644 --- a/Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_st7920_sw_spi.cpp +++ b/Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_st7920_sw_spi.cpp @@ -57,25 +57,26 @@ #ifdef __SAM3X8E__ - #include - #include - #include "../../core/macros.h" +#include +#include +#include "../../core/macros.h" - void u8g_SetPIOutput_DUE(u8g_t *u8g, uint8_t pin_index) { - PIO_Configure(g_APinDescription[u8g->pin_list[pin_index]].pPort, PIO_OUTPUT_1, - g_APinDescription[u8g->pin_list[pin_index]].ulPin, g_APinDescription[u8g->pin_list[pin_index]].ulPinConfiguration); // OUTPUT - } +void u8g_SetPIOutput_DUE(u8g_t *u8g, uint8_t pin_index) { + PIO_Configure(g_APinDescription[u8g->pin_list[pin_index]].pPort, PIO_OUTPUT_1, + g_APinDescription[u8g->pin_list[pin_index]].ulPin, g_APinDescription[u8g->pin_list[pin_index]].ulPinConfiguration); // OUTPUT +} - void u8g_SetPILevel_DUE(u8g_t *u8g, uint8_t pin_index, uint8_t level) { - volatile Pio* port = g_APinDescription[u8g->pin_list[pin_index]].pPort; - uint32_t mask = g_APinDescription[u8g->pin_list[pin_index]].ulPin; - if (level) port->PIO_SODR = mask; - else port->PIO_CODR = mask; - } +void u8g_SetPILevel_DUE(u8g_t *u8g, uint8_t pin_index, uint8_t level) { + volatile Pio* port = g_APinDescription[u8g->pin_list[pin_index]].pPort; + uint32_t mask = g_APinDescription[u8g->pin_list[pin_index]].ulPin; + if (level) port->PIO_SODR = mask; + else port->PIO_CODR = mask; +} #define nop() __asm__ __volatile__("nop;\n\t":::) void __delay_4cycles(uint32_t cy) __attribute__ ((weak)); + FORCE_INLINE void __delay_4cycles(uint32_t cy) { // +1 cycle #if ARCH_PIPELINE_RELOAD_CYCLES<2 #define EXTRA_NOP_CYCLES "nop" @@ -96,107 +97,107 @@ FORCE_INLINE void __delay_4cycles(uint32_t cy) { // +1 cycle ); } - Pio *SCK_pPio, *MOSI_pPio; - uint32_t SCK_dwMask, MOSI_dwMask; +Pio *SCK_pPio, *MOSI_pPio; +uint32_t SCK_dwMask, MOSI_dwMask; - static void spiSend_sw_DUE(uint8_t val) { // 800KHz - for (uint8_t i = 0; i < 8; i++) { - if (val & 0x80) - MOSI_pPio->PIO_SODR = MOSI_dwMask; - else - MOSI_pPio->PIO_CODR = MOSI_dwMask; - val = val << 1; - __delay_4cycles(2); - SCK_pPio->PIO_SODR = SCK_dwMask; - __delay_4cycles(22); - SCK_pPio->PIO_CODR = SCK_dwMask; - } +static void spiSend_sw_DUE(uint8_t val) { // 800KHz + for (uint8_t i = 0; i < 8; i++) { + if (val & 0x80) + MOSI_pPio->PIO_SODR = MOSI_dwMask; + else + MOSI_pPio->PIO_CODR = MOSI_dwMask; + val = val << 1; + __delay_4cycles(2); + SCK_pPio->PIO_SODR = SCK_dwMask; + __delay_4cycles(22); + SCK_pPio->PIO_CODR = SCK_dwMask; + } +} + +static uint8_t rs_last_state = 255; + +static void u8g_com_DUE_st7920_write_byte_sw_spi(uint8_t rs, uint8_t val) { + uint8_t i; + + if ( rs != rs_last_state) { // time to send a command/data byte + rs_last_state = rs; + + if ( rs == 0 ) + /* command */ + spiSend_sw_DUE(0x0f8); + else + /* data */ + spiSend_sw_DUE(0x0fa); + + for( i = 0; i < 4; i++ ) // give the controller some time to process the data + u8g_10MicroDelay(); // 2 is bad, 3 is OK, 4 is safe } - static uint8_t rs_last_state = 255; - - static void u8g_com_DUE_st7920_write_byte_sw_spi(uint8_t rs, uint8_t val) { - uint8_t i; - - if ( rs != rs_last_state) { // time to send a command/data byte - rs_last_state = rs; - - if ( rs == 0 ) - /* command */ - spiSend_sw_DUE(0x0f8); - else - /* data */ - spiSend_sw_DUE(0x0fa); - - for( i = 0; i < 4; i++ ) // give the controller some time to process the data - u8g_10MicroDelay(); // 2 is bad, 3 is OK, 4 is safe - } - - spiSend_sw_DUE(val & 0x0f0); - spiSend_sw_DUE(val << 4); - } + spiSend_sw_DUE(val & 0x0f0); + spiSend_sw_DUE(val << 4); +} - uint8_t u8g_com_HAL_DUE_ST7920_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) { - switch (msg) { - case U8G_COM_MSG_INIT: - SCK_pPio = g_APinDescription[u8g->pin_list[U8G_PI_SCK]].pPort; - SCK_dwMask = g_APinDescription[u8g->pin_list[U8G_PI_SCK]].ulPin; - MOSI_pPio = g_APinDescription[u8g->pin_list[U8G_PI_MOSI]].pPort; - MOSI_dwMask = g_APinDescription[u8g->pin_list[U8G_PI_MOSI]].ulPin; +uint8_t u8g_com_HAL_DUE_ST7920_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) { + switch (msg) { + case U8G_COM_MSG_INIT: + SCK_pPio = g_APinDescription[u8g->pin_list[U8G_PI_SCK]].pPort; + SCK_dwMask = g_APinDescription[u8g->pin_list[U8G_PI_SCK]].ulPin; + MOSI_pPio = g_APinDescription[u8g->pin_list[U8G_PI_MOSI]].pPort; + MOSI_dwMask = g_APinDescription[u8g->pin_list[U8G_PI_MOSI]].ulPin; - u8g_SetPILevel_DUE(u8g, U8G_PI_CS, 0); - u8g_SetPIOutput_DUE(u8g, U8G_PI_CS); - u8g_SetPILevel_DUE(u8g, U8G_PI_SCK, 0); - u8g_SetPIOutput_DUE(u8g, U8G_PI_SCK); - u8g_SetPILevel_DUE(u8g, U8G_PI_MOSI, 0); - u8g_SetPILevel_DUE(u8g, U8G_PI_MOSI, 1); - u8g_SetPIOutput_DUE(u8g, U8G_PI_MOSI); - u8g_Delay(5); - u8g->pin_list[U8G_PI_A0_STATE] = 0; /* inital RS state: command mode */ - break; + u8g_SetPILevel_DUE(u8g, U8G_PI_CS, 0); + u8g_SetPIOutput_DUE(u8g, U8G_PI_CS); + u8g_SetPILevel_DUE(u8g, U8G_PI_SCK, 0); + u8g_SetPIOutput_DUE(u8g, U8G_PI_SCK); + u8g_SetPILevel_DUE(u8g, U8G_PI_MOSI, 0); + u8g_SetPILevel_DUE(u8g, U8G_PI_MOSI, 1); + u8g_SetPIOutput_DUE(u8g, U8G_PI_MOSI); + u8g_Delay(5); + u8g->pin_list[U8G_PI_A0_STATE] = 0; /* inital RS state: command mode */ + break; - case U8G_COM_MSG_STOP: - break; + case U8G_COM_MSG_STOP: + break; - case U8G_COM_MSG_RESET: - if (U8G_PIN_NONE != u8g->pin_list[U8G_PI_RESET]) u8g_SetPILevel_DUE(u8g, U8G_PI_RESET, arg_val); - break; + case U8G_COM_MSG_RESET: + if (U8G_PIN_NONE != u8g->pin_list[U8G_PI_RESET]) u8g_SetPILevel_DUE(u8g, U8G_PI_RESET, arg_val); + break; - case U8G_COM_MSG_ADDRESS: /* define cmd (arg_val = 0) or data mode (arg_val = 1) */ - u8g->pin_list[U8G_PI_A0_STATE] = arg_val; - break; + case U8G_COM_MSG_ADDRESS: /* define cmd (arg_val = 0) or data mode (arg_val = 1) */ + u8g->pin_list[U8G_PI_A0_STATE] = arg_val; + break; - case U8G_COM_MSG_CHIP_SELECT: - if (U8G_PIN_NONE != u8g->pin_list[U8G_PI_CS]) - u8g_SetPILevel_DUE(u8g, U8G_PI_CS, arg_val); //note: the st7920 has an active high chip select - break; + case U8G_COM_MSG_CHIP_SELECT: + if (U8G_PIN_NONE != u8g->pin_list[U8G_PI_CS]) + u8g_SetPILevel_DUE(u8g, U8G_PI_CS, arg_val); //note: the st7920 has an active high chip select + break; - case U8G_COM_MSG_WRITE_BYTE: + case U8G_COM_MSG_WRITE_BYTE: - u8g_com_DUE_st7920_write_byte_sw_spi(u8g->pin_list[U8G_PI_A0_STATE], arg_val); - break; + u8g_com_DUE_st7920_write_byte_sw_spi(u8g->pin_list[U8G_PI_A0_STATE], arg_val); + break; - case U8G_COM_MSG_WRITE_SEQ: { - uint8_t *ptr = (uint8_t*) arg_ptr; - while (arg_val > 0) { - u8g_com_DUE_st7920_write_byte_sw_spi(u8g->pin_list[U8G_PI_A0_STATE], *ptr++); - arg_val--; - } + case U8G_COM_MSG_WRITE_SEQ: { + uint8_t *ptr = (uint8_t*) arg_ptr; + while (arg_val > 0) { + u8g_com_DUE_st7920_write_byte_sw_spi(u8g->pin_list[U8G_PI_A0_STATE], *ptr++); + arg_val--; } - break; + } + break; - case U8G_COM_MSG_WRITE_SEQ_P: { - uint8_t *ptr = (uint8_t*) arg_ptr; - while (arg_val > 0) { - u8g_com_DUE_st7920_write_byte_sw_spi(u8g->pin_list[U8G_PI_A0_STATE], *ptr++); - arg_val--; - } + case U8G_COM_MSG_WRITE_SEQ_P: { + uint8_t *ptr = (uint8_t*) arg_ptr; + while (arg_val > 0) { + u8g_com_DUE_st7920_write_byte_sw_spi(u8g->pin_list[U8G_PI_A0_STATE], *ptr++); + arg_val--; } - break; - } - return 1; + } + break; } + return 1; +} #pragma GCC reset_options