WebSVN – DashDisplay – Diff – /branches/Dashboard_L152_v2/Src/main.c

+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
-  * File Name          : main.c
+  * @file           : main.c
-  * Description        : Main program body
+  * @brief          : Main program body
   ******************************************************************************
+  * @attention
+  *
-  * COPYRIGHT(c) 2018 STMicroelectronics
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
-  * Redistribution and use in source and binary forms, with or without modification,
+  * This software component is licensed by ST under BSD 3-Clause license,
-  * are permitted provided that the following conditions are met:
+  * the "License"; You may not use this file except in compliance with the
-  *   1. Redistributions of source code must retain the above copyright notice,
-  *      this list of conditions and the following disclaimer.
-  *   2. 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.
+  * License. You may obtain a copy of the License at:
-  *   3. Neither the name of STMicroelectronics nor the names of its contributors
-  *      may be used to endorse or promote products derived from this software
+  *                        opensource.org/licenses/BSD-3-Clause
-  *      without specific prior written permission.
-  *
-  * 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.
+  *
   ******************************************************************************
   */
+/* USER CODE END Header */
 /* Includes ------------------------------------------------------------------*/
-#include "stm32l1xx_hal.h"
+#include "main.h"
+/* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
-#include "ap_math.h"
+#include "libPLX/plx.h"
-#include "serial.h"
+#include "libSerial/serial.H"
-#include "SSD1306.h"
-#include "Font.h"
-#include "dials.h"
+#include "libSmallPrintf/small_printf.h"
 #include "switches.h"
-#include <math.h>
-#include "plx.h"
-#include "displayinfo.h"
-#include "small_printf.h"
-#include "nvram.h"
 /* USER CODE END Includes */
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+/* USER CODE END PTD */
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+/* USER CODE END PD */
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+/* USER CODE END PM */
 /* Private variables ---------------------------------------------------------*/
 SPI_HandleTypeDef hspi1;
+TIM_HandleTypeDef htim2;
 TIM_HandleTypeDef htim3;
 TIM_HandleTypeDef htim9;
 UART_HandleTypeDef huart1;
 UART_HandleTypeDef huart2;
 UART_HandleTypeDef huart3;
 /* USER CODE BEGIN PV */
 /* Private variables ---------------------------------------------------------*/
-#define MAXRDG 32
+context_t contexts[MAX_DISPLAYS];
 /* timeout when the ignition is switched off */
 #define IGNITION_OFF_TIMEOUT 30000UL
-int OldObservation[2] =
-{ -1, -1 }; // illegal initial value
-int OldObservationIndex[2] =
-{ -1, -1 }; // if more than one sensor this will be printed
-int16_t dial0[2] =
-{ 0, 0 };
-int16_t dial1[2] =
-{ -1, -1 };
-uint16_t dial_timer[2] =
-{ 0, 0 };
-static const int DialTimeout = 50; // about 20 seconds after twiddle, save the dial position.
+const int DialTimeout = 50; // about 20 seconds after twiddle, save the dial position.
-uint16_t dial_nvram[2] __attribute__((section(".NVRAM_Data")));
+uint16_t dial_nvram[MAX_DISPLAYS] __attribute__((section(".NVRAM_Data")));
-union
-{
-        PLX_SensorInfo Sensor[MAXRDG];
-        char Bytes[MAXRDG * sizeof(PLX_SensorInfo)];
-} Data;
+data_t Data;
 int Max[MAXRDG];
 int Min[MAXRDG];
 int PLXItems;
 uint32_t Latch_Timer = IGNITION_OFF_TIMEOUT;
 /* USER CODE END PV */
 /* Private function prototypes -----------------------------------------------*/
 void SystemClock_Config(void);
-void Error_Handler(void);
 static void MX_GPIO_Init(void);
 static void MX_SPI1_Init(void);
 static void MX_USART1_UART_Init(void);
 static void MX_USART2_UART_Init(void);
 static void MX_USART3_UART_Init(void);
 static void MX_TIM3_Init(void);
 static void MX_TIM9_Init(void);
+static void MX_TIM2_Init(void);
 /* USER CODE BEGIN PFP */
-/* Private function prototypes -----------------------------------------------*/
-/* USER CODE END PFP */
-/* USER CODE BEGIN 0 */
-/* dummy function */
-void _init(void)
-{
-}
 // the dial is the switch number we are using.
 // suppress is the ItemIndex we wish to suppress on this display
 int DisplayCurrent(int dial, int suppress)
+{
-        char buff[10];
-        int i;
-        int rc;
-        select_display(dial); // pick the display we are using
-        int ItemIndex = dial_pos[dial] % PLXItems;
-#if 0
-        // wrap around count if dial too far to the right
-        if (ItemIndex >= PLXItems)
-        {
-                dial_pos[dial] = 0;
-                ItemIndex = 0;
-        }
-        if (ItemIndex < 0)
-        {
-                ItemIndex = PLXItems - 1;
-                dial_pos[dial] = (PLXItems - 1) * 4;
-        }
-#endif
-        // check for item suppression
-        if (ItemIndex == suppress)
-        {
-                dial1[dial] = -1;
-                OldObservation[dial] = -1;
-                OldObservationIndex[dial] = -1;
-                clearDisplay();
-                display();
-                return -1; // we suppressed this display
-        }
-        // do not try to convert if no items in buffer
-        if (PLXItems > 0)
+  if (PLXItems == 0)
-        {
-                int DataVal = ConvPLX(Data.Sensor[ItemIndex].ReadingH,
-                                Data.Sensor[ItemIndex].ReadingL); // data reading
-                int Observation = ConvPLX(Data.Sensor[ItemIndex].AddrH,
-                                Data.Sensor[ItemIndex].AddrL);
-                int ObservationIndex = ConvPLX(0, Data.Sensor[ItemIndex].Instance);
-                // now to convert the readings and format strings
-                // find out limits
-                char * msg;
-                int len;
-                // if the user presses the dial then reset min/max to current value
-                if (push_pos[dial] == 1)
-                {
-                        Max[ItemIndex] = DataVal;
-                        Min[ItemIndex] = DataVal; // 12 bit max value
-                }
-                if (Observation < PLX_MAX_OBS)
-                {
-                        if (Observation != OldObservation[dial]
-                                        || ObservationIndex != OldObservationIndex[dial])
-                        {
-                                dial_timer[dial] = DialTimeout;
-                                dial1[dial] = -1;
-                                clearDisplay();
-                                dial_draw_scale(DisplayInfo[Observation].Low,
-                                                DisplayInfo[Observation].High, 12, 1,
-                                                DisplayInfo[Observation].TickScale);
-                                msg = DisplayInfo[Observation].name;
-                                len = 7;
+    return -1;
-                                int len1 = ObservationIndex > 0 ? len - 1 : len;
-                                for (i = 0; i < len1 && msg[i]; i++)
-                                {
-                                        buff[i] = msg[i];
-                                }
-                                if (ObservationIndex > 0 && i < len)
-                                {
-                                        buff[i++] = ObservationIndex + '1';
-                                }
-                                print_large_string(buff, 64 - i * 4, 48, i); // this prints spaces for \0 at end of string
-                                // print suffix if present.
-                                font_gotoxy(15, 4);
-                                int i = 0;
-                                while (DisplayInfo[Observation].suffix[i])
-                                {
-                                        font_putchar(DisplayInfo[Observation].suffix[i++]);
-                                }
-                                OldObservation[dial] = Observation;
-                                OldObservationIndex[dial] = ObservationIndex;
-                                //
-                                display();
-                        }
-                        else
-                        {
-                                // check for timer timeout on consistent timer
-                                if (dial_timer[dial])
-                                {
-                                        dial_timer[dial]--;
-                                        if (dial_timer[dial] == 0)
-                                        {
-                                                uint16_t curr_val = dial_pos[dial];
-                                                uint32_t addr = (uint32_t) (&dial_nvram[dial]);
-                                            WriteUint16NVRAM(addr, curr_val );
-                                        }
-                                }
-                        }
-                }
-                double max_rdg;
-                double min_rdg;
-                double cur_rdg;
-                int int_rdg;
-                int int_max;
-                int int_min;
-                max_rdg = ConveriMFDRaw2Data(Observation,
-                                DisplayInfo[Observation].Units, Max[ItemIndex]);
-                min_rdg = ConveriMFDRaw2Data(Observation,
-                                DisplayInfo[Observation].Units, Min[ItemIndex]);
-                cur_rdg = ConveriMFDRaw2Data(Observation,
-                                DisplayInfo[Observation].Units, DataVal);
-                int dp_pos;  // where to print the decimal place
-                float scale = 1.0;
-                switch (DisplayInfo[Observation].DP)
-                {
-                case 0:
-                        scale = 1.0;
-                        dp_pos = 100;
-                        break;
-                case 1:
-                        scale = 10.0;
-                        dp_pos = 1;
-                        break;
-                case 2:
-                        scale = 100.0;
-                        dp_pos = 2;
-                        break;
-                }
-                int_rdg = (int) (cur_rdg * scale);
-                int_max = (int) (max_rdg * scale);
-                int_min = (int) (min_rdg * scale);
-                cur_rdg -= DisplayInfo[Observation].Low;
-                cur_rdg =  SINE_STEPS * cur_rdg
-                                                / (DisplayInfo[Observation].High
-                                                                - DisplayInfo[Observation].Low);
-                dial0[dial] = (int) cur_rdg;
-                /* old needle un-draw */
-                if (dial1[dial] >= 0)
-                {
-                        dial_draw_needle(dial1[dial]);
-                }
-                dial_draw_needle(dial0[dial]);
-                // print value overlaid by needle
-                // this is actual reading
-                print_digits(30, 30, 5, dp_pos, int_rdg);
-                font_gotoxy(0, 0);
-                font_digits(5, dp_pos, int_min);
-                font_gotoxy(0, 1);
-                font_puts("Min");
-                font_gotoxy(15, 0);
-                font_digits(5, dp_pos, int_max);
-                font_gotoxy(18, 1);
-                font_puts("Max");
-                dial1[dial] = dial0[dial];
+  int itemIndex = dial_pos[dial] % PLXItems;
-                display();
-        }
-return ItemIndex;
+  return cc_display(dial, itemIndex, suppress);
+}
+/* USER CODE END PFP */
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
 /* USER CODE END 0 */
+/**
+  * @brief  The application entry point.
+  * @retval int
+  */
 int main(void)
+{
   /* USER CODE BEGIN 1 */
+  __HAL_RCC_SPI1_CLK_ENABLE()
+  ;
+  __HAL_RCC_USART1_CLK_ENABLE()
+  ; // PLX main port
+  __HAL_RCC_USART2_CLK_ENABLE()
+  ; // debug port
+  __HAL_RCC_USART3_CLK_ENABLE ()
+  ; // Bluetooth port
-GPIO_InitTypeDef GPIO_InitStruct;
-__HAL_RCC_SPI1_CLK_ENABLE()
+  __HAL_RCC_TIM3_CLK_ENABLE();
-;
-__HAL_RCC_USART1_CLK_ENABLE()
-; // PLX main port
-__HAL_RCC_USART2_CLK_ENABLE()
-; // debug port
-__HAL_RCC_USART3_CLK_ENABLE ()
-; // Bluetooth port
-__HAL_RCC_TIM3_CLK_ENABLE();
+  __HAL_RCC_TIM9_CLK_ENABLE();
-__HAL_RCC_TIM9_CLK_ENABLE();
   /* USER CODE END 1 */
-  /* MCU Configuration----------------------------------------------------------*/
+  /* MCU Configuration--------------------------------------------------------*/
   /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
   HAL_Init();
+  /* USER CODE BEGIN Init */
+  /* USER CODE END Init */
   /* Configure the system clock */
   SystemClock_Config();
+  /* USER CODE BEGIN SysInit */
+  /* USER CODE END SysInit */
   /* Initialize all configured peripherals */
   MX_GPIO_Init();
   MX_SPI1_Init();
   MX_USART1_UART_Init();
   MX_USART2_UART_Init();
   MX_USART3_UART_Init();
   MX_TIM3_Init();
   MX_TIM9_Init();
+  MX_TIM2_Init();
   /* USER CODE BEGIN 2 */
-/* Turn on USART1 IRQ */
+  /* Turn on USART1 IRQ */
-HAL_NVIC_SetPriority(USART1_IRQn, 2, 0);
+  HAL_NVIC_SetPriority(USART1_IRQn, 2, 0);
-HAL_NVIC_EnableIRQ(USART1_IRQn);
+  HAL_NVIC_EnableIRQ(USART1_IRQn);
-/* Turn on USART2 IRQ  */
-HAL_NVIC_SetPriority(USART2_IRQn, 4, 0);
-HAL_NVIC_EnableIRQ(USART2_IRQn);
-/* turn on USART3 IRQ */
+  /* Turn on USART2 IRQ  */
-HAL_NVIC_SetPriority(USART3_IRQn, 4, 0);
+  HAL_NVIC_SetPriority(USART2_IRQn, 4, 0);
-HAL_NVIC_EnableIRQ(USART3_IRQn);
+  HAL_NVIC_EnableIRQ(USART2_IRQn);
-/* setup the USART control blocks */
+  /* turn on USART3 IRQ */
-init_usart_ctl(&uc1, huart1.Instance);
+  HAL_NVIC_SetPriority(USART3_IRQn, 4, 0);
-init_usart_ctl(&uc2, huart2.Instance);
-init_usart_ctl(&uc3, huart3.Instance);
+  HAL_NVIC_EnableIRQ(USART3_IRQn);
+  /* setup the USART control blocks */
-EnableSerialRxInterrupt(&uc1);
+  init_usart_ctl(&uc1, huart1.Instance);
-EnableSerialRxInterrupt(&uc2);
+  init_usart_ctl(&uc2, huart2.Instance);
-EnableSerialRxInterrupt(&uc3);
+  init_usart_ctl(&uc3, huart3.Instance);
+  EnableSerialRxInterrupt(&uc1);
+  EnableSerialRxInterrupt(&uc2);
-HAL_TIM_Encoder_Start(&htim3, TIM_CHANNEL_ALL);
+  EnableSerialRxInterrupt(&uc3);
-HAL_TIM_Encoder_Start(&htim9, TIM_CHANNEL_ALL);
+  HAL_TIM_Encoder_Start(&htim3, TIM_CHANNEL_ALL);
-InitSwitches();
+  HAL_TIM_Encoder_Start(&htim9, TIM_CHANNEL_ALL);
-int i;
-uint16_t rc;
-for (i = 0; i < 2; i++)
-{
-        dial_pos[i] = dial_nvram[i];
-}
-ap_init(); // set up the approximate math library
+  // Switch handler called on sysTick interrupt.
+  InitSwitches();
-int disp;
+  cc_init();
-ssd1306_begin(1, 0);
+  int i;
-dial_origin(64, 60);
+  for (i = 0; i < 2; i++)
+  {
-dial_size(60);
+        dial_pos[i] = dial_nvram[i];
+  }
-/* reset the display timeout, latch on power from accessories */
+  /* reset the display timeout, latch on power from accessories */
-Latch_Timer = IGNITION_OFF_TIMEOUT;
+  Latch_Timer = IGNITION_OFF_TIMEOUT;
-HAL_GPIO_WritePin(POWER_LATCH_GPIO_Port, POWER_LATCH_Pin, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(POWER_LATCH_GPIO_Port, POWER_LATCH_Pin, GPIO_PIN_RESET);
-for (disp = 0; disp < 2; disp++)
+  /* USER CODE END 2 */
-{
-        select_display(disp);
-        clearDisplay();
-        dim(0);
-        //font_puts(
-        //              "Hello world !!\rThis text is a test of the text rendering library in a 5*7 font");
-        dial_draw_scale(0, 10, 12, 5, 1);
+  /* Infinite loop */
-        char buffer[] = "Unit is  ";
+  /* USER CODE BEGIN WHILE */
-        buffer[8] = disp + '1';
+ while(1){
-        print_large_string(buffer, 20, 30, 9);
+  /* while ignition is on, keep resetting power latch timer */
+  if (HAL_GPIO_ReadPin(IGNITION_GPIO_Port, IGNITION_Pin) == GPIO_PIN_RESET)
+  {
+        Latch_Timer = HAL_GetTick() + IGNITION_OFF_TIMEOUT;
+  }
-        display();
+  else
+  {
+        /* if the ignition has been off for a while, then turn off power */
+        if (HAL_GetTick() > Latch_Timer)
+        {
+                HAL_GPIO_WritePin(POWER_LATCH_GPIO_Port, POWER_LATCH_Pin,
+                                GPIO_PIN_RESET);
+        }
+  }
+  uint32_t timeout = 0;  //
+  // PLX decoder protocols
+  char PLXPacket = 0;
+  for (i = 0; i < MAXRDG; i++)
+  {
+        Max[i] = 0;
+        Min[i] = 0xFFF; // 12 bit max value
-}
+  }
-  /* USER CODE END 2 */
+  int PLXPtr = 0;
+  while (1)
+  {
+  // Handle the bluetooth pairing function by pressing both buttons.
+        if ((push_pos[0] == 1) && (push_pos[1] == 1))
+        {
+                HAL_GPIO_WritePin(BT_BUTTON_GPIO_Port, BT_BUTTON_Pin, GPIO_PIN_SET);
+        }
+        else
+        {
+                HAL_GPIO_WritePin(BT_BUTTON_GPIO_Port, BT_BUTTON_Pin, GPIO_PIN_RESET);
+        }
+        uint16_t cc = SerialCharsReceived(&uc1);
+        int chr;
+        if (cc == 0)
+        {
+                timeout++;
+                if (timeout % 1000 == 0)
+                {
+                        const char msg[] = "Timeout\r\n";
+                        char * p = msg;
+                        while(*p)
+                        {
+                                PutCharSerial(&uc3,*p++);
+                        }
+                }
+                if (timeout > 60000)
+                {
+                    // do turn off screen
+                }
+        }
+        for (chr = 0; chr < cc; chr++)
+        {
+                char c = GetCharSerial(&uc1);
+                if (c == PLX_Start) // at any time if the start byte appears, reset the pointers
+                {
+                        PLXPtr = 0;    // reset the pointer
+                        PLXPacket = 1;
+                        timeout = 0;    // Reset the timer
+                }
+                else if (c == PLX_Stop)
+                {
+                        if (PLXPacket)
+                        {
+                                // we can now decode the selected parameter
+                                PLXItems = PLXPtr / sizeof(PLX_SensorInfo); // total
+                                // saturate the rotary switch position
-  /* Infinite loop */
+                                int DataVal;
+                                // process min/max
+                                for (i = 0; i < PLXItems; i++)
+                                {
-  /* USER CODE BEGIN WHILE */
+                                        // Send item to BT
+                                        uint16_t addr = ConvPLX(Data.Sensor[i].AddrH,
+                                                        Data.Sensor[i].AddrL);
-uint32_t Ticks = HAL_GetTick() + 100;
+                                        uint8_t inst = Data.Sensor[i].Instance;
+                                        uint16_t reading = ConvPLX(Data.Sensor[i].ReadingH,
+                                                        Data.Sensor[i].ReadingL);
+                                        char outbuff[100];
+                                        small_sprintf(outbuff, "%d,%d,%d\n\r", addr, inst,
+                                                        reading);
+                                        int ck=0;
+                                        while(outbuff[ck] && ck < 100)
+                                        {
+                                                PutCharSerial(&uc2, outbuff[ck++]);
+                                        }
+                                        DataVal = ConvPLX(Data.Sensor[i].ReadingH,
+                                                        Data.Sensor[i].ReadingL);
+                                        if (DataVal > Max[i])
+                                        {
+                                                Max[i] = DataVal;
+                                        }
+                                        if (DataVal < Min[i])
+                                        {
+                                                Min[i] = DataVal;
+                                        }
+                                }
+                                // now to display the information
+                                int suppress = DisplayCurrent(0, -1);
+                                DisplayCurrent(1, suppress);
+                        }
+                        PLXPtr = 0;
+                        PLXPacket = 0;
+                }
+                else if (c > PLX_Stop) // illegal char, restart reading
+                {
+                        PLXPacket = 0;
+                        PLXPtr = 0;
+                }
+                else if (PLXPacket && PLXPtr < sizeof(Data.Bytes))
+                {
+                        Data.Bytes[PLXPtr++] = c;
+                }
-/* while ignition is on, keep resetting power latch timer */
-if (HAL_GPIO_ReadPin(IGNITION_GPIO_Port, IGNITION_Pin) == GPIO_PIN_RESET)
-{
-        Latch_Timer = HAL_GetTick() + IGNITION_OFF_TIMEOUT;
-}
-else
-{
-        /* if the ignition has been off for a while, then turn off power */
-        if (HAL_GetTick() > Latch_Timer)
-        {
-                HAL_GPIO_WritePin(POWER_LATCH_GPIO_Port, POWER_LATCH_Pin,
-                                GPIO_PIN_RESET);
-        }
-}
-uint32_t timeout = 0;  //
-// PLX decoder protocols
-char PLXPacket = 0;
-for (i = 0; i < MAXRDG; i++)
-{
-        Max[i] = 0;
-        Min[i] = 0xFFF; // 12 bit max value
-}
-int PLXPtr = 0;
-while (1)
-{
-// poll switche
-        HandleSwitches();
-// Handle the bluetooth pairing function by pressing both buttons.
-        if ((push_pos[0] == 1) && (push_pos[1] == 1))
-        {
-                HAL_GPIO_WritePin(BT_BUTTON_GPIO_Port, BT_BUTTON_Pin, GPIO_PIN_SET);
-        }
-        else
-        {
-                HAL_GPIO_WritePin(BT_BUTTON_GPIO_Port, BT_BUTTON_Pin, GPIO_PIN_RESET);
-        }
-        uint16_t cc = SerialCharsReceived(&uc1);
-        int chr;
-        if (cc == 0)
-        {
-                timeout++;
-                if (timeout % 1000 == 0)
-                {
-                        const char msg[] = "No data\r\n";
-                        char * p = msg;
-                        while(*p)
-                        {
-                                PutCharSerial(&uc2,*p++);
-                        }
-                }
-                if (timeout > 60000)
-                {
-                        // do turn off screen
-                }
-        }
-        for (chr = 0; chr < cc; chr++)
-        {
-                char c = GetCharSerial(&uc1);
-                timeout = 0;
-                if (c == PLX_Start) // at any time if the start byte appears, reset the pointers
-                {
-                        PLXPtr = 0;    // reset the pointer
-                        PLXPacket = 1;
-                }
-                else if (c == PLX_Stop)
-                {
-                        if (PLXPacket)
-                        {
-                                // we can now decode the selected parameter
-                                PLXItems = PLXPtr / sizeof(PLX_SensorInfo); // total
-                                // saturate the rotary switch position
-                                int DataVal;
-                                // process min/max
-                                for (i = 0; i < PLXItems; i++)
-                                {
-                                        // Send item to BT
-                                        uint16_t addr = ConvPLX(Data.Sensor[i].AddrH,
-                                                        Data.Sensor[i].AddrL);
-                                        uint8_t inst = Data.Sensor[i].Instance;
-                                        uint16_t reading = ConvPLX(Data.Sensor[i].ReadingH,
-                                                        Data.Sensor[i].ReadingL);
-                                        char outbuff[100];
-                                        int cnt = small_sprintf(outbuff, "%d,%d,%d\n\r", addr, inst,
-                                                        reading);
-                                        int ck=0;
-                                        while(outbuff[ck] && ck < 100)
-                                        {
-                                                PutCharSerial(&uc2, outbuff[ck++]);
-                                        }
-                                        DataVal = ConvPLX(Data.Sensor[i].ReadingH,
-                                                        Data.Sensor[i].ReadingL);
-                                        if (DataVal > Max[i])
-                                        {
-                                                Max[i] = DataVal;
-                                        }
-                                        if (DataVal < Min[i])
-                                        {
-                                                Min[i] = DataVal;
-                                        }
-                                }
-                                // now to display the information
-                                int suppress = DisplayCurrent(0, -1);
-                                DisplayCurrent(1, suppress);
-                        }
+        }
-                        PLXPtr = 0;
-                        PLXPacket = 0;
-                }
-                else if (c > PLX_Stop) // illegal char, restart reading
-                {
-                        PLXPacket = 0;
-                        PLXPtr = 0;
-                }
-                else if (PLXPtr < sizeof(Data.Bytes))
-                {
-                        Data.Bytes[PLXPtr++] = c;
-                }
-        }
         HAL_Delay(1);
-}
+  }
-  /* USER CODE END WHILE */
-  /* USER CODE BEGIN 3 */
+    /* USER CODE END WHILE */
+    /* USER CODE BEGIN 3 */
+  }
   /* USER CODE END 3 */
+}
+/**
-/** System Clock Configuration
+  * @brief System Clock Configuration
+  * @retval None
-*/
+  */
 void SystemClock_Config(void)
+{
+  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
+  RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
-  RCC_OscInitTypeDef RCC_OscInitStruct;
-  RCC_ClkInitTypeDef RCC_ClkInitStruct;
+  /** Configure the main internal regulator output voltage
+  */
-  __HAL_RCC_PWR_CLK_ENABLE();
   __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
+  /** Initializes the RCC Oscillators according to the specified parameters
+  * in the RCC_OscInitTypeDef structure.
+  */
   RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
   RCC_OscInitStruct.HSEState = RCC_HSE_BYPASS;
   RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
   RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
   RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL12;
   RCC_OscInitStruct.PLL.PLLDIV = RCC_PLL_DIV3;
   if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
     Error_Handler();
+  }
+  /** Initializes the CPU, AHB and APB buses clocks
+  */
   RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
                               |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
   RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
   RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
   RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
   RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
   if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK)
+  {
     Error_Handler();
+  }
-  HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq()/1000);
-  HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
-  /* SysTick_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(SysTick_IRQn, 0, 0);
+}
+/**
-/* SPI1 init function */
+  * @brief SPI1 Initialization Function
+  * @param None
+  * @retval None
+  */
 static void MX_SPI1_Init(void)
+{
+  /* USER CODE BEGIN SPI1_Init 0 */
+  /* USER CODE END SPI1_Init 0 */
+  /* USER CODE BEGIN SPI1_Init 1 */
+  /* USER CODE END SPI1_Init 1 */
+  /* SPI1 parameter configuration*/
   hspi1.Instance = SPI1;
   hspi1.Init.Mode = SPI_MODE_MASTER;
   hspi1.Init.Direction = SPI_DIRECTION_1LINE;
   hspi1.Init.DataSize = SPI_DATASIZE_8BIT;
   hspi1.Init.CLKPolarity = SPI_POLARITY_HIGH;
   hspi1.Init.CLKPhase = SPI_PHASE_1EDGE;
   hspi1.Init.NSS = SPI_NSS_SOFT;
-  hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_4;
+  hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_8;
   hspi1.Init.FirstBit = SPI_FIRSTBIT_MSB;
   hspi1.Init.TIMode = SPI_TIMODE_DISABLE;
   hspi1.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE;
   hspi1.Init.CRCPolynomial = 10;
   if (HAL_SPI_Init(&hspi1) != HAL_OK)
+  {
     Error_Handler();
+  }
+  /* USER CODE BEGIN SPI1_Init 2 */
+  /* USER CODE END SPI1_Init 2 */
+}
+/**
+  * @brief TIM2 Initialization Function
+  * @param None
+  * @retval None
+  */
+static void MX_TIM2_Init(void)
+{
+  /* USER CODE BEGIN TIM2_Init 0 */
+  /* USER CODE END TIM2_Init 0 */
+  TIM_ClockConfigTypeDef sClockSourceConfig = {0};
+  TIM_MasterConfigTypeDef sMasterConfig = {0};
+  /* USER CODE BEGIN TIM2_Init 1 */
+  /* USER CODE END TIM2_Init 1 */
+  htim2.Instance = TIM2;
+  htim2.Init.Prescaler = 0;
+  htim2.Init.CounterMode = TIM_COUNTERMODE_UP;
+  htim2.Init.Period = 65535;
+  htim2.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
+  htim2.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
+  if (HAL_TIM_Base_Init(&htim2) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
+  if (HAL_TIM_ConfigClockSource(&htim2, &sClockSourceConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
+  sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
+  if (HAL_TIMEx_MasterConfigSynchronization(&htim2, &sMasterConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN TIM2_Init 2 */
+  /* USER CODE END TIM2_Init 2 */
+}
+/**
-/* TIM3 init function */
+  * @brief TIM3 Initialization Function
+  * @param None
+  * @retval None
+  */
 static void MX_TIM3_Init(void)
+{
+  /* USER CODE BEGIN TIM3_Init 0 */
+  /* USER CODE END TIM3_Init 0 */
-  TIM_Encoder_InitTypeDef sConfig;
+  TIM_Encoder_InitTypeDef sConfig = {0};
-  TIM_MasterConfigTypeDef sMasterConfig;
+  TIM_MasterConfigTypeDef sMasterConfig = {0};
+  /* USER CODE BEGIN TIM3_Init 1 */
+  /* USER CODE END TIM3_Init 1 */
   htim3.Instance = TIM3;
   htim3.Init.Prescaler = 0;
   htim3.Init.CounterMode = TIM_COUNTERMODE_UP;
-  htim3.Init.Period = 0xffff;
+  htim3.Init.Period = 65535;
-  htim3.Init.ClockDivision = TIM_CLOCKDIVISION_DIV4;
+  htim3.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
+  htim3.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
   sConfig.EncoderMode = TIM_ENCODERMODE_TI1;
-  sConfig.IC1Polarity = TIM_ICPOLARITY_FALLING;
+  sConfig.IC1Polarity = TIM_ICPOLARITY_RISING;
   sConfig.IC1Selection = TIM_ICSELECTION_DIRECTTI;
   sConfig.IC1Prescaler = TIM_ICPSC_DIV1;
   sConfig.IC1Filter = 15;
-  sConfig.IC2Polarity = TIM_ICPOLARITY_FALLING;
+  sConfig.IC2Polarity = TIM_ICPOLARITY_RISING;
   sConfig.IC2Selection = TIM_ICSELECTION_DIRECTTI;
   sConfig.IC2Prescaler = TIM_ICPSC_DIV1;
   sConfig.IC2Filter = 15;
   if (HAL_TIM_Encoder_Init(&htim3, &sConfig) != HAL_OK)
+  {
     Error_Handler();
+  }
   sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
   sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
   if (HAL_TIMEx_MasterConfigSynchronization(&htim3, &sMasterConfig) != HAL_OK)
+  {
     Error_Handler();
+  }
+  /* USER CODE BEGIN TIM3_Init 2 */
+  /* USER CODE END TIM3_Init 2 */
+}
+/**
-/* TIM9 init function */
+  * @brief TIM9 Initialization Function
+  * @param None
+  * @retval None
+  */
 static void MX_TIM9_Init(void)
+{
-  TIM_Encoder_InitTypeDef sConfig;
+  /* USER CODE BEGIN TIM9_Init 0 */
-  TIM_MasterConfigTypeDef sMasterConfig;
+  /* USER CODE END TIM9_Init 0 */
+  TIM_Encoder_InitTypeDef sConfig = {0};
+  TIM_MasterConfigTypeDef sMasterConfig = {0};
+  /* USER CODE BEGIN TIM9_Init 1 */
+  /* USER CODE END TIM9_Init 1 */
   htim9.Instance = TIM9;
   htim9.Init.Prescaler = 0;
   htim9.Init.CounterMode = TIM_COUNTERMODE_UP;
-  htim9.Init.Period = 0xffff;
+  htim9.Init.Period = 65535;
-  htim9.Init.ClockDivision = TIM_CLOCKDIVISION_DIV4;
+  htim9.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
+  htim9.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
   sConfig.EncoderMode = TIM_ENCODERMODE_TI1;
-  sConfig.IC1Polarity = TIM_ICPOLARITY_FALLING;
+  sConfig.IC1Polarity = TIM_ICPOLARITY_RISING;
   sConfig.IC1Selection = TIM_ICSELECTION_DIRECTTI;
   sConfig.IC1Prescaler = TIM_ICPSC_DIV1;
   sConfig.IC1Filter = 15;
-  sConfig.IC2Polarity = TIM_ICPOLARITY_FALLING;
+  sConfig.IC2Polarity = TIM_ICPOLARITY_RISING;
   sConfig.IC2Selection = TIM_ICSELECTION_DIRECTTI;
   sConfig.IC2Prescaler = TIM_ICPSC_DIV1;
-  sConfig.IC2Filter = 15;
+  sConfig.IC2Filter = 0;
   if (HAL_TIM_Encoder_Init(&htim9, &sConfig) != HAL_OK)
+  {
     Error_Handler();
+  }
   sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
   sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
   if (HAL_TIMEx_MasterConfigSynchronization(&htim9, &sMasterConfig) != HAL_OK)
+  {
     Error_Handler();
+  }
+  /* USER CODE BEGIN TIM9_Init 2 */
+  /* USER CODE END TIM9_Init 2 */
+}
+/**
-/* USART1 init function */
+  * @brief USART1 Initialization Function
+  * @param None
+  * @retval None
+  */
 static void MX_USART1_UART_Init(void)
+{
+  /* USER CODE BEGIN USART1_Init 0 */
+  /* USER CODE END USART1_Init 0 */
+  /* USER CODE BEGIN USART1_Init 1 */
+  /* USER CODE END USART1_Init 1 */
   huart1.Instance = USART1;
   huart1.Init.BaudRate = 19200;
   huart1.Init.WordLength = UART_WORDLENGTH_8B;
   huart1.Init.StopBits = UART_STOPBITS_1;
   huart1.Init.Parity = UART_PARITY_NONE;
   huart1.Init.OverSampling = UART_OVERSAMPLING_16;
   if (HAL_UART_Init(&huart1) != HAL_OK)
+  {
     Error_Handler();
+  }
+  /* USER CODE BEGIN USART1_Init 2 */
+  /* USER CODE END USART1_Init 2 */
+}
+/**
-/* USART2 init function */
+  * @brief USART2 Initialization Function
+  * @param None
+  * @retval None
+  */
 static void MX_USART2_UART_Init(void)
+{
+  /* USER CODE BEGIN USART2_Init 0 */
+  /* USER CODE END USART2_Init 0 */
+  /* USER CODE BEGIN USART2_Init 1 */
+  /* USER CODE END USART2_Init 1 */
   huart2.Instance = USART2;
   huart2.Init.BaudRate = 115200;
   huart2.Init.WordLength = UART_WORDLENGTH_8B;
   huart2.Init.StopBits = UART_STOPBITS_1;
   huart2.Init.Parity = UART_PARITY_NONE;
   huart2.Init.OverSampling = UART_OVERSAMPLING_16;
   if (HAL_UART_Init(&huart2) != HAL_OK)
+  {
     Error_Handler();
+  }
+  /* USER CODE BEGIN USART2_Init 2 */
+  /* USER CODE END USART2_Init 2 */
+}
+/**
-/* USART3 init function */
+  * @brief USART3 Initialization Function
+  * @param None
+  * @retval None
+  */
 static void MX_USART3_UART_Init(void)
+{
+  /* USER CODE BEGIN USART3_Init 0 */
+  /* USER CODE END USART3_Init 0 */
+  /* USER CODE BEGIN USART3_Init 1 */
+  /* USER CODE END USART3_Init 1 */
   huart3.Instance = USART3;
   huart3.Init.BaudRate = 19200;
   huart3.Init.WordLength = UART_WORDLENGTH_8B;
-  huart3.Init.StopBits = UART_STOPBITS_2;
+  huart3.Init.StopBits = UART_STOPBITS_1;
   huart3.Init.Parity = UART_PARITY_NONE;
   huart3.Init.Mode = UART_MODE_TX_RX;
   huart3.Init.HwFlowCtl = UART_HWCONTROL_NONE;
   huart3.Init.OverSampling = UART_OVERSAMPLING_16;
   if (HAL_UART_Init(&huart3) != HAL_OK)
+  {
     Error_Handler();
+  }
+  /* USER CODE BEGIN USART3_Init 2 */
+  /* USER CODE END USART3_Init 2 */
+}
-/** Configure pins as
+/**
-        * Analog
+  * @brief GPIO Initialization Function
-        * Input
+  * @param None
-        * Output
-        * EVENT_OUT
-        * EXTI
+  * @retval None
-*/
+  */
 static void MX_GPIO_Init(void)
+{
-  GPIO_InitTypeDef GPIO_InitStruct;
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
   /* GPIO Ports Clock Enable */
   __HAL_RCC_GPIOH_CLK_ENABLE();
   __HAL_RCC_GPIOA_CLK_ENABLE();
   __HAL_RCC_GPIOC_CLK_ENABLE();
   __HAL_RCC_GPIOB_CLK_ENABLE();
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(GPIOA, SPI_NSS1_Pin|SPI1CD_Pin|BT_BUTTON_Pin, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(SPI_NSS1_GPIO_Port, SPI_NSS1_Pin, GPIO_PIN_SET);
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(GPIOC, SPI_RESET_Pin|SPI_NSS2_Pin|POWER_LATCH_Pin|USB_PWR_Pin, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(GPIOA, SPI_CD_Pin|BT_BUTTON_Pin, GPIO_PIN_RESET);
+  /*Configure GPIO pin Output Level */
+  HAL_GPIO_WritePin(GPIOC, SPI_RESET_Pin|POWER_LATCH_Pin|USB_PWR_Pin, GPIO_PIN_RESET);
+  /*Configure GPIO pin Output Level */
+  HAL_GPIO_WritePin(SPI_NSS2_GPIO_Port, SPI_NSS2_Pin, GPIO_PIN_SET);
-  /*Configure GPIO pins : SPI_NSS1_Pin SPI1CD_Pin */
+  /*Configure GPIO pins : SPI_NSS1_Pin SPI_CD_Pin */
-  GPIO_InitStruct.Pin = SPI_NSS1_Pin|SPI1CD_Pin;
+  GPIO_InitStruct.Pin = SPI_NSS1_Pin|SPI_CD_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 /* USER CODE END 4 */
 /**
   * @brief  This function is executed in case of error occurrence.
-  * @param  None
   * @retval None
   */
 void Error_Handler(void)
+{
-  /* USER CODE BEGIN Error_Handler */
+  /* USER CODE BEGIN Error_Handler_Debug */
-/* User can add his own implementation to report the HAL error return state */
+  /* User can add his own implementation to report the HAL error return state */
-while (1)
-{
-}
-  /* USER CODE END Error_Handler */
-}
-#ifdef USE_FULL_ASSERT
+  /* USER CODE END Error_Handler_Debug */
+}
+#ifdef  USE_FULL_ASSERT
 /**
-   * @brief Reports the name of the source file and the source line number
+  * @brief  Reports the name of the source file and the source line number
-   * where the assert_param error has occurred.
+  *         where the assert_param error has occurred.
-   * @param file: pointer to the source file name
+  * @param  file: pointer to the source file name
-   * @param line: assert_param error line source number
+  * @param  line: assert_param error line source number
-   * @retval None
+  * @retval None
-   */
+  */
-void assert_failed(uint8_t* file, uint32_t line)
+void assert_failed(uint8_t *file, uint32_t line)
+{
   /* USER CODE BEGIN 6 */
-/* User can add his own implementation to report the file name and line number,
+  /* User can add his own implementation to report the file name and line number,
- ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+     tex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
   /* USER CODE END 6 */
+}
-#endif
+#endif /* USE_FULL_ASSERT */
-/**
-  * @}
-  */
-/**
-  * @}
-*/
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Subversion Repositories DashDisplay

(root)/branches/Dashboard_L152_v2/Src/main.c – Rev 49 → 50