Changeset 43 for trunk/firmware_v4/SES/src
- Timestamp:
- Nov 3, 2026, 2:39:08 PM (30 hours ago)
- Location:
- trunk/firmware_v4/SES/src
- Files:
-
- 8 edited
-
chip_temperature.c (modified) (1 diff)
-
main.c (modified) (1 diff)
-
modbus.c (modified) (2 diffs)
-
mode_lvp.c (modified) (1 diff)
-
mode_lvp_ovp.c (modified) (1 diff)
-
mode_ovp.c (modified) (1 diff)
-
mode_secondaryprotection.c (modified) (6 diffs)
-
mode_secondaryprotection_plus.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/firmware_v4/SES/src/chip_temperature.c
r42 r43 44 44 uint16_t * pCalibrationData; 45 45 float calibrationData30; 46 float calibrationData130;46 //float calibrationData130; 47 47 48 48 // lade Temperatur Kalibrierungswert (Wert bei 30°C) -
trunk/firmware_v4/SES/src/main.c
r42 r43 221 221 HAL_TIM_Base_Start_IT(&htim16); 222 222 HAL_TIM_IC_Start_IT(&htim16, TIM_CHANNEL_1); 223 int oldcaptureValue=0;223 //int oldcaptureValue=0; 224 224 225 225 -
trunk/firmware_v4/SES/src/modbus.c
r42 r43 73 73 // --- Private Funktions Prototypen -------------------------------------------- 74 74 75 void mbUartInit (modbus_t * mb_data,UART_HandleTypeDef* usart, uint32_t baudrate, uint32_t parityMode, uint32_t stopBits , uint32_t nrOfBitsPerChar);76 uint16_t mbCrc16 (uint8_t *buf, uint32_t len);77 void mbSend (modbus_t * mb_data );78 uint32_t mbSlaveReadHoldingRegisters (uint8_t * response_string, uint8_t *msg, uint32_t tx_position, uint8_t deviceID);79 uint32_t mbSlaveWriteMultipleRegisters (uint8_t * response_string, uint8_t *msg,uint32_t tx_position, uint32_t deviceID);80 uint32_t mbSlaveWriteSingleRegister (uint8_t * response_string,uint8_t *msg,uint32_t tx_position, uint32_t deviceID);75 void mbUartInit (modbus_t* mb_data,UART_HandleTypeDef* usart, uint32_t baudrate, uint32_t parityMode, uint32_t stopBits , uint32_t nrOfBitsPerChar); 76 uint16_t mbCrc16 (uint8_t* buf, uint32_t len); 77 void mbSend (modbus_t* mb_data ); 78 uint32_t mbSlaveReadHoldingRegisters (uint8_t* response_string, uint8_t* msg, uint32_t tx_position, uint8_t deviceID); 79 uint32_t mbSlaveWriteMultipleRegisters (uint8_t* response_string, uint8_t* msg, uint32_t tx_position, uint32_t deviceID); 80 uint32_t mbSlaveWriteSingleRegister (uint8_t* response_string,uint8_t* msg, uint32_t tx_position, uint32_t deviceID); 81 81 uint32_t mbSlaveResponseException (uint8_t* response_string, uint32_t function_code, uint32_t exception_code,uint32_t tx_position) ; 82 static HAL_StatusTypeDef RS485_ModbusEx_Init (UART_HandleTypeDef *huart, uint32_t Polarity, uint32_t AssertionTime, uint32_t DeassertionTime, uint32_t charReceiveTimeout);83 static void UART_TxISR_8BIT (UART_HandleTypeDef *huart);82 //static HAL_StatusTypeDef RS485_ModbusEx_Init (UART_HandleTypeDef *huart, uint32_t Polarity, uint32_t AssertionTime, uint32_t DeassertionTime, uint32_t charReceiveTimeout); 83 //static void UART_TxISR_8BIT (UART_HandleTypeDef *huart); 84 84 85 85 // --- GEMEINSAME MODBUS FUNKTIONEN -------------------------------------------- … … 426 426 //static TASK_MODBUS_MASTER_Message_t xMessage[255]; 427 427 //static TASK_MODBUS_MASTER_Message_t *pxMessage; 428 static bword_t values[SEND_TO_SLAVES_BUFFER_COUNT];429 static uint32_t y;430 static uint32_t z;428 //static bword_t values[SEND_TO_SLAVES_BUFFER_COUNT]; 429 //static uint32_t y; 430 //static uint32_t z; 431 431 432 432 uint32_t mbSlaveCheckModbusRtuQuery(modbus_t * mb_data) -
trunk/firmware_v4/SES/src/mode_lvp.c
r42 r43 236 236 { 237 237 int faultInput; 238 int lvpAndOvpInput;238 //int lvpAndOvpInput; 239 239 240 240 if (HAL_GPIO_ReadPin(GPIO_INPUT_FAULT_GPIO_Port, GPIO_INPUT_FAULT_Pin) == GPIO_PIN_RESET) -
trunk/firmware_v4/SES/src/mode_lvp_ovp.c
r42 r43 249 249 { 250 250 int faultInput; 251 int lvpAndOvpInput;251 //int lvpAndOvpInput; 252 252 253 253 if (HAL_GPIO_ReadPin(GPIO_INPUT_FAULT_GPIO_Port, GPIO_INPUT_FAULT_Pin) == GPIO_PIN_RESET) -
trunk/firmware_v4/SES/src/mode_ovp.c
r42 r43 235 235 { 236 236 int faultInput; 237 int ovpAndOvpInput;237 //int ovpAndOvpInput; 238 238 239 239 if (HAL_GPIO_ReadPin(GPIO_INPUT_FAULT_GPIO_Port, GPIO_INPUT_FAULT_Pin) == GPIO_PIN_RESET) -
trunk/firmware_v4/SES/src/mode_secondaryprotection.c
r42 r43 59 59 { 60 60 int faultInput; 61 int lvpAndOvpInput;61 //int lvpAndOvpInput; 62 62 63 63 if (HAL_GPIO_ReadPin(GPIO_INPUT_FAULT_GPIO_Port, GPIO_INPUT_FAULT_Pin) == GPIO_PIN_RESET) … … 72 72 if ((HAL_GPIO_ReadPin(GPIO_INPUT_LVP_GPIO_Port, GPIO_INPUT_LVP_Pin) == GPIO_PIN_SET) && (HAL_GPIO_ReadPin(GPIO_INPUT_OVP_GPIO_Port, GPIO_INPUT_OVP_Pin) == GPIO_PIN_SET)) 73 73 { 74 lvpAndOvpInput = 1;74 //lvpAndOvpInput = 1; 75 75 }else { 76 lvpAndOvpInput = 0;76 //lvpAndOvpInput = 0; 77 77 } 78 78 … … 130 130 static void SECONDARYPROTECTION_SM_On(void) 131 131 { 132 int faultInput = 0;132 //int faultInput = 0; 133 133 int lvpAndOvpInput = 0; 134 134 static int lvpAndOvpInputTimeCounter = 0; … … 137 137 if (HAL_GPIO_ReadPin(GPIO_INPUT_FAULT_GPIO_Port, GPIO_INPUT_FAULT_Pin) == GPIO_PIN_RESET) 138 138 { 139 faultInput = 1;139 //faultInput = 1; 140 140 RELAIS_ResetPuls(); 141 141 BUZZER_Beep(BUZZER_ON_TIME_REJECT); //Warnung … … 153 153 else 154 154 { 155 faultInput = 0;155 //faultInput = 0; 156 156 } 157 157 … … 294 294 { 295 295 int faultInput; 296 int lvpAndOvpInput;296 //int lvpAndOvpInput; 297 297 static uint32_t retry_counter = 0; 298 298 static uint32_t oldTimeMSTick; -
trunk/firmware_v4/SES/src/mode_secondaryprotection_plus.c
r42 r43 52 52 { 53 53 int faultInput; 54 int lvpAndOvpInput;54 //int lvpAndOvpInput; 55 55 56 56 if (HAL_GPIO_ReadPin(GPIO_INPUT_FAULT_GPIO_Port, GPIO_INPUT_FAULT_Pin) == GPIO_PIN_RESET) … … 65 65 if ((HAL_GPIO_ReadPin(GPIO_INPUT_LVP_GPIO_Port, GPIO_INPUT_LVP_Pin) == GPIO_PIN_SET) && (HAL_GPIO_ReadPin(GPIO_INPUT_OVP_GPIO_Port, GPIO_INPUT_OVP_Pin) == GPIO_PIN_SET)) 66 66 { 67 lvpAndOvpInput = 1;67 //lvpAndOvpInput = 1; 68 68 }else { 69 lvpAndOvpInput = 0;69 //lvpAndOvpInput = 0; 70 70 } 71 71 … … 261 261 { 262 262 int faultInput; 263 int lvpAndOvpInput;263 //int lvpAndOvpInput; 264 264 static uint32_t retry_counter = 0; 265 265 static uint32_t oldTimeMSTick;
Note:
See TracChangeset
for help on using the changeset viewer.
