add temperature label

Author: KoSik-prog

Connect/connect.py

@@ -36,6 +36,8 @@ def __init__(self):
             print('device not found!')
             serial.Serial.close()
             exit()
+        else:
+            time.sleep(.1)
         rxData = ''
         try:
             self.serialConn = serial.Serial(self.bldcPort, 115200, timeout=0, parity=serial.PARITY_EVEN, rtscts=1)
@@ -103,7 +105,10 @@ def readData(self):
 
     def __del__(self):
         print("connection destruction")
-        self.serialConn.close()
+        try:
+            self.serialConn.close()
+        except AttributeError:
+            print("port closed")
 
 class Gui:
     def __init__(self):

Connect/web/index.html

@@ -37,11 +37,16 @@ <h1 id="myTitle">BLDC Driver connect</h1>
           .posFont {
             font: 8px Verdana;
           }
+          .tempFont {
+            font: 4px Verdana;
+            fill: #2e2c2c;
+          }
         </style>
         <circle cx="50%" cy="50%" r="49%" stroke="#909090" stroke-width="1" fill="#505050"/>
-        <text id="bldcPosition" x="52%" y="65%" class="posFont">0</text>
         <line id="motorPosition" x1="50%" y1="50%" x2="50%" y2="1px" style="stroke:rgb(128, 128, 128); stroke-width:1";/>
         <line id="motorExpectedPosition" x1="50%" y1="50%" x2="50%" y2="1px" style="stroke:rgb(184, 58, 9); stroke-width:1";/>
+        <text id="bldcPosition" x="52%" y="65%" class="posFont">0</text>
+        <text id="temperature" x="20%" y="30%" class="tempFont">0</text>
       </svg>
 
       <div id="modeSelect">

Connect/web/js/app.js

@@ -51,6 +51,14 @@ function call_Back(output){
 
     actualPower = Math.round(partsArray[7]);
     document.getElementById("actualPower").style.transform = "scale(" + actualPower  + "%, 100%)";
+
+    console.log(partsArray);
+    document.getElementById("temperature").innerHTML = partsArray[8] + "°C";
+    if(partsArray[8] > 30){
+        document.getElementById("temperature").style.fill = "#992626";
+    } else {
+        document.getElementById("temperature").style.fill = "#162818";
+    }
 } 
 
 

Core/Src/main.c

@@ -75,8 +75,9 @@ uint8_t TXFlag = 0;
 PID_TypeDef PowerPID;
 double PowerPIDSetpoint = 0.0;
 //PID_TypeDef AccelerationPID;
+
+
 //OTHERS
-uint16_t testi = 0;
 extern uint8_t initPhase;
 uint16_t test_array[4095];
 
@@ -85,6 +86,8 @@ extern uint16_t expectedDegree;
 extern uint16_t expectedPower;
 
 extern uint8_t mode; //driver program 0-1pos / 1-switch
+
+uint16_t temperature = 0;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
@@ -282,9 +285,10 @@ int main(void)
   /* USER CODE BEGIN WHILE */
 	while (1) {
 		MessageLength = sprintf((char*) DataToSend,
-						"#%i,%i,%lu,%lu,%lu,%i,%.0f,%.0f/\n\r", mode, bldcEncoder.calculatedAngle,
+						"#%i,%i,%lu,%lu,%lu,%i,%.0f,%.0f,%i/\n\r", mode, bldcEncoder.calculatedAngle,
 						bldcMotor.pwmU, bldcMotor.pwmV, bldcMotor.pwmW,
-						bldcMotor.expectedPosition, bldcMotor.expectedPower, bldcMotor.actualPower);
+						bldcMotor.expectedPosition, bldcMotor.expectedPower, bldcMotor.actualPower,
+						temperature);
 		CDC_Transmit_FS(DataToSend, MessageLength);
 
 		if(bldcMotor.expectedPower != (float)expectedPower){
@@ -295,14 +299,18 @@ int main(void)
 			}
 			PID_SetOutputLimits(&PowerPID, 12, bldcMotor.expectedPower);
 		}
-		HAL_Delay(50);
+
 		if(mode == 0){
 			float newPos = expectedDegree * 1.1406;
 			bldcMotor.expectedPosition = (uint16_t)newPos;
 		} else if (mode == 1){
 			uint16_t switchPos = expectedDegree * 1.1406;
 			bldcHapticSwitch(0, switchPos);
 		}
+
+		temperature = (0.04 * (uint16_t)adc_raw_table[4]) - 56;;
+
+		HAL_Delay(50);
     /* USER CODE END WHILE */
 
     /* USER CODE BEGIN 3 */

Core/Src/stm32f1xx_hal_msp.c

@@ -136,8 +136,8 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef* hadc)
     hdma_adc1.Init.Direction = DMA_PERIPH_TO_MEMORY;
     hdma_adc1.Init.PeriphInc = DMA_PINC_DISABLE;
     hdma_adc1.Init.MemInc = DMA_MINC_ENABLE;
-    hdma_adc1.Init.PeriphDataAlignment = DMA_PDATAALIGN_HALFWORD;
-    hdma_adc1.Init.MemDataAlignment = DMA_MDATAALIGN_HALFWORD;
+    hdma_adc1.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
+    hdma_adc1.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
     hdma_adc1.Init.Mode = DMA_CIRCULAR;
     hdma_adc1.Init.Priority = DMA_PRIORITY_LOW;
     if (HAL_DMA_Init(&hdma_adc1) != HAL_OK)

STM32F103_BLDC_Driver.ioc

@@ -21,10 +21,10 @@ ADC1.SamplingTime-4\#ChannelRegularConversion=ADC_SAMPLETIME_41CYCLES_5
 ADC1.master=1
 Dma.ADC1.3.Direction=DMA_PERIPH_TO_MEMORY
 Dma.ADC1.3.Instance=DMA1_Channel1
-Dma.ADC1.3.MemDataAlignment=DMA_MDATAALIGN_HALFWORD
+Dma.ADC1.3.MemDataAlignment=DMA_MDATAALIGN_WORD
 Dma.ADC1.3.MemInc=DMA_MINC_ENABLE
 Dma.ADC1.3.Mode=DMA_CIRCULAR
-Dma.ADC1.3.PeriphDataAlignment=DMA_PDATAALIGN_HALFWORD
+Dma.ADC1.3.PeriphDataAlignment=DMA_PDATAALIGN_WORD
 Dma.ADC1.3.PeriphInc=DMA_PINC_DISABLE
 Dma.ADC1.3.Priority=DMA_PRIORITY_LOW
 Dma.ADC1.3.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority