fix code-style issues

db2e37d3 · Manuel Kasten · schneider · bb13e44c · db2e37d3
Commit db2e37d3 authored 5 years ago by Manuel Kasten Committed by schneider 5 years ago
--- a/lib/gfx/GUI_DEV/DEV_Config.c
+++ b/lib/gfx/GUI_DEV/DEV_Config.c
 /*****************************************************************************
 * | File        :   DEV_Config.c
 * | Author      :   Waveshare team
 * | Function    :   Hardware underlying interface
 * | Info        :
 *                Used to shield the underlying layers of each master 
 *                and enhance portability
 *----------------
 * | This version:   V1.0
 * | Date        :   2018-11-22
 * | Info        :
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documnetation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to  whom the Software is
 # furished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #
 ******************************************************************************/
 #include "DEV_Config.h"
 #include "spi.h"
 #define SPI SPI2
 //const gpio_cfg_t DEV_CS_PIN = {PORT_0, PIN_8, GPIO_FUNC_OUT, GPIO_PAD_NONE};
 //const gpio_cfg_t DEV_BL_PIN = {PORT_0, PIN_8, GPIO_FUNC_OUT, GPIO_PAD_NONE};
-static spi_req_t req = {.rx_data = NULL, .bits=8, .width = SPI17Y_WIDTH_1, .ssel = 0, .deass = 1, .ssel_pol = SPI17Y_POL_LOW, .tx_num = 0, .rx_num = 0};
+static spi_req_t req = { .rx_data  = NULL,
-#define SPI_SPEED (15 * 1000 * 1000) // Bit Rate. Display has 15 MHz limit
+			 .bits     = 8,
+			 .width    = SPI17Y_WIDTH_1,
-/********************************************************************************/
+			 .ssel     = 0,
-void lcd_write(uint8_t *data, int size)
+			 .deass    = 1,
-{
+			 .ssel_pol = SPI17Y_POL_LOW,
-    sys_cfg_spi_t spi17y_master_cfg;
+			 .tx_num   = 0,
+			 .rx_num   = 0 };
-    spi17y_master_cfg.map = MAP_A;
+#define SPI_SPEED (15 * 1000 * 1000) // Bit Rate. Display has 15 MHz limit
-    spi17y_master_cfg.ss0 = Enable;
-    spi17y_master_cfg.ss1 = Disable;
+/********************************************************************************/
-    spi17y_master_cfg.ss2 = Disable;
+void lcd_write(uint8_t *data, int size)
-    if (SPI_Init(SPI2, 0, SPI_SPEED, spi17y_master_cfg) != 0) {
+{
-        printf("Error configuring SPI\n");
+	sys_cfg_spi_t spi17y_master_cfg;
-        while (1)
-            ;
+	spi17y_master_cfg.map = MAP_A;
-    }
+	spi17y_master_cfg.ss0 = Enable;
-    req.tx_data = data;
+	spi17y_master_cfg.ss1 = Disable;
-    req.len = size;
+	spi17y_master_cfg.ss2 = Disable;
-    SPI_MasterTrans(SPI, &req);
+	if (SPI_Init(SPI2, 0, SPI_SPEED, spi17y_master_cfg) != 0) {
-}
+		printf("Error configuring SPI\n");
+		while (1)
-// Parameters for PWM output
+			;
-#define PORT_PWM PORT_0 // port
+	}
-#define PIN_PWM PIN_28  // pin
+	req.tx_data = data;
-#define FREQ 200        // (Hz)
+	req.len     = size;
-#define PWM_TIMER MXC_TMR4 // must change PORT_PWM and PIN_PWM if changed
+	SPI_MasterTrans(SPI, &req);
-void DEV_Set_BL(uint16_t _Value)
+}
-{
-	// Declare variables
+// Parameters for PWM output
-	gpio_cfg_t gpio_pwm;   // to configure GPIO
+#define PORT_PWM PORT_0    // port
-	tmr_cfg_t tmr;         // to congigure timer
+#define PIN_PWM PIN_28     // pin
-	tmr_pwm_cfg_t tmr_pwm; // for configure PWM
+#define FREQ 200           // (Hz)
-	unsigned int period_ticks = PeripheralClock / FREQ;
+#define PWM_TIMER MXC_TMR4 // must change PORT_PWM and PIN_PWM if changed
-	unsigned int duty_ticks   = period_ticks * _Value / 1000;
+void DEV_Set_BL(uint16_t _Value)
+{
-	// Congfigure GPIO port and pin for PWM
+	// Declare variables
-	gpio_pwm.func = GPIO_FUNC_ALT4;
+	gpio_cfg_t gpio_pwm;   // to configure GPIO
-	gpio_pwm.port = PORT_PWM;
+	tmr_cfg_t tmr;         // to congigure timer
-	gpio_pwm.mask = PIN_PWM;
+	tmr_pwm_cfg_t tmr_pwm; // for configure PWM
-	gpio_pwm.pad  = GPIO_PAD_PULL_DOWN;
+	unsigned int period_ticks = PeripheralClock / FREQ;
+	unsigned int duty_ticks   = period_ticks * _Value / 1000;
-	if (GPIO_Config(&gpio_pwm) != E_NO_ERROR) {
-		printf("Failed GPIO_Config for pwm.\n");
+	// Congfigure GPIO port and pin for PWM
-	}
+	gpio_pwm.func = GPIO_FUNC_ALT4;
+	gpio_pwm.port = PORT_PWM;
-	/* 
+	gpio_pwm.mask = PIN_PWM;
-    Steps for configuring a timer for PWM mode:
+	gpio_pwm.pad  = GPIO_PAD_PULL_DOWN;
-    1. Disable the timer
-    2. Set the prescale value
+	if (GPIO_Config(&gpio_pwm) != E_NO_ERROR) {
-    3. Configure the timer for PWM mode
+		printf("Failed GPIO_Config for pwm.\n");
-    4. Set polarity, pwm parameters
+	}
-    5. Enable Timer
-    */
+	/* 
+    Steps for configuring a timer for PWM mode:
-	TMR_Disable(PWM_TIMER);
+    1. Disable the timer
+    2. Set the prescale value
-	TMR_Init(PWM_TIMER, TMR_PRES_1, 0);
+    3. Configure the timer for PWM mode
+    4. Set polarity, pwm parameters
-	tmr.mode    = TMR_MODE_PWM;
+    5. Enable Timer
-	tmr.cmp_cnt = period_ticks;
+    */
-	tmr.pol     = 0;
-	TMR_Config(PWM_TIMER, &tmr);
+	TMR_Disable(PWM_TIMER);
-	tmr_pwm.pol      = 1;
+	TMR_Init(PWM_TIMER, TMR_PRES_1, 0);
-	tmr_pwm.per_cnt  = period_ticks;
-	tmr_pwm.duty_cnt = duty_ticks;
+	tmr.mode    = TMR_MODE_PWM;
+	tmr.cmp_cnt = period_ticks;
-	if (TMR_PWMConfig(PWM_TIMER, &tmr_pwm) != E_NO_ERROR) {
+	tmr.pol     = 0;
-		printf("Failed TMR_PWMConfig.\n");
+	TMR_Config(PWM_TIMER, &tmr);
-	}
+	tmr_pwm.pol      = 1;
-	TMR_Enable(PWM_TIMER);
+	tmr_pwm.per_cnt  = period_ticks;
+	tmr_pwm.duty_cnt = duty_ticks;
-	printf("PWM started.\n");
-}
+	if (TMR_PWMConfig(PWM_TIMER, &tmr_pwm) != E_NO_ERROR) {
+		printf("Failed TMR_PWMConfig.\n");
+	}
+	TMR_Enable(PWM_TIMER);
+	printf("PWM started.\n");
+}