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 557165296da00923783ee28ec5c5669b0bfce8fb..26c2ac1d272bbfcfe750bcf7d90a24e91720fad0 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 <U8glib.h>
- #include <Arduino.h>
- #include "../../core/macros.h"
+#include <U8glib.h>
+#include <Arduino.h>
+#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;
-
- 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;
- }
+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;
+static uint8_t rs_last_state = 255;
- if ( rs != rs_last_state) { // time to send a command/data byte
- rs_last_state = rs;
+static void u8g_com_DUE_st7920_write_byte_sw_spi(uint8_t rs, uint8_t val) {
+ uint8_t i;
- if ( rs == 0 )
- /* command */
- spiSend_sw_DUE(0x0f8);
- else
- /* data */
- spiSend_sw_DUE(0x0fa);
+ if ( rs != rs_last_state) { // time to send a command/data byte
+ rs_last_state = rs;
- 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
- }
+ if ( rs == 0 )
+ /* command */
+ spiSend_sw_DUE(0x0f8);
+ else
+ /* data */
+ spiSend_sw_DUE(0x0fa);
- spiSend_sw_DUE(val & 0x0f0);
- spiSend_sw_DUE(val << 4);
+ 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--;
- }
+
+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;
+
+ 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