Merge branch 'master' of ssh://git@git.fasttube.de:313/FaSTTUBe/dashboard.git
This commit is contained in:
		@ -192,7 +192,7 @@ int main(void)
 | 
				
			|||||||
	  }
 | 
						  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	  // Inverted in hardware
 | 
						  // Inverted in hardware
 | 
				
			||||||
	  if ((HAL_GetTick() - ams_last_tick) < 80) {
 | 
						  if ((HAL_GetTick() - ams_last_tick) < 150) { //master sendet aller 100ms, fürs testen erstmal auf 150ms gesetzt -> kann später wieder runter
 | 
				
			||||||
		  HAL_GPIO_WritePin(IMD_LED_GPIO_Port, IMD_LED_Pin, dash_rx.imd_ok);
 | 
							  HAL_GPIO_WritePin(IMD_LED_GPIO_Port, IMD_LED_Pin, dash_rx.imd_ok);
 | 
				
			||||||
		  HAL_GPIO_WritePin(AMS_LED_GPIO_Port, AMS_LED_Pin, dash_rx.ams_state != TS_ERROR);
 | 
							  HAL_GPIO_WritePin(AMS_LED_GPIO_Port, AMS_LED_Pin, dash_rx.ams_state != TS_ERROR);
 | 
				
			||||||
		  HAL_GPIO_WritePin(TSOFF_LED_GPIO_Port, TSOFF_LED_Pin, dash_rx.ams_state == TS_INACTIVE);
 | 
							  HAL_GPIO_WritePin(TSOFF_LED_GPIO_Port, TSOFF_LED_Pin, dash_rx.ams_state == TS_INACTIVE);
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user