|  | @@ -1,3 +1,5 @@
 | 
											
												
													
														|  | 
 |  | +#ifdef HARDWARE_BT6702
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |  #include "stm32f4xx.h"  
 |  |  #include "stm32f4xx.h"  
 | 
											
												
													
														|  |  #include "private_mib.h"
 |  |  #include "private_mib.h"
 | 
											
												
													
														|  |  #include "parameters.h"
 |  |  #include "parameters.h"
 | 
											
										
											
												
													
														|  | @@ -31,11 +33,6 @@ static s16_t signal_get_value(struct snmp_node_instance* instance, void* value);
 | 
											
												
													
														|  |  static snmp_err_t signal_set_value(struct snmp_node_instance* instance, u16_t len, void* value);
 |  |  static snmp_err_t signal_set_value(struct snmp_node_instance* instance, u16_t len, void* value);
 | 
											
												
													
														|  |  static snmp_err_t signal_set_test(struct snmp_node_instance* instance, u16_t len, void* value);
 |  |  static snmp_err_t signal_set_test(struct snmp_node_instance* instance, u16_t len, void* value);
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -#ifdef HARDWARE_BT6706
 |  | 
 | 
											
												
													
														|  | -/* signal .1.3.6.1.4.1.41752.911.3.1.19  */
 |  | 
 | 
											
												
													
														|  | -static const struct snmp_scalar_node signal19 = SNMP_SCALAR_CREATE_NODE(19, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 |  | 
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | -#endif
 |  | 
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  /* signal .1.3.6.1.4.1.41752.911.3.1.18  */
 |  |  /* signal .1.3.6.1.4.1.41752.911.3.1.18  */
 | 
											
												
													
														|  |  static const struct snmp_scalar_node signal18 = SNMP_SCALAR_CREATE_NODE_READONLY(18, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 |  |  static const struct snmp_scalar_node signal18 = SNMP_SCALAR_CREATE_NODE_READONLY(18, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 | 
											
										
											
												
													
														|  | @@ -115,9 +112,6 @@ static const struct snmp_node* const signals_nodes[] = {
 | 
											
												
													
														|  |  	&signal16.node.node,
 |  |  	&signal16.node.node,
 | 
											
												
													
														|  |  	&signal17.node.node,
 |  |  	&signal17.node.node,
 | 
											
												
													
														|  |  	&signal18.node.node,
 |  |  	&signal18.node.node,
 | 
											
												
													
														|  | -#ifdef HARDWARE_BT6706
 |  | 
 | 
											
												
													
														|  | -	&signal19.node.node
 |  | 
 | 
											
												
													
														|  | -#endif
 |  | 
 | 
											
												
													
														|  |  };
 |  |  };
 | 
											
												
													
														|  |  static const struct snmp_tree_node signals_node = SNMP_CREATE_TREE_NODE(1, signals_nodes);
 |  |  static const struct snmp_tree_node signals_node = SNMP_CREATE_TREE_NODE(1, signals_nodes);
 | 
											
												
													
														|  |  
 |  |  
 | 
											
										
											
												
													
														|  | @@ -215,11 +209,6 @@ static s16_t signal_get_value(struct snmp_node_instance* instance, void* value)
 | 
											
												
													
														|  |  	case 18: /* Alarms */
 |  |  	case 18: /* Alarms */
 | 
											
												
													
														|  |  		GetAlarmStr((char*)paramStr, ¶mLength);
 |  |  		GetAlarmStr((char*)paramStr, ¶mLength);
 | 
											
												
													
														|  |  		break;
 |  |  		break;
 | 
											
												
													
														|  | -#ifdef HARDWARE_BT6706
 |  | 
 | 
											
												
													
														|  | -	case 19: /* DO2*/
 |  | 
 | 
											
												
													
														|  | -		GetDOUTStatusStr((char*)paramStr, ¶mLength, 2);
 |  | 
 | 
											
												
													
														|  | -		break;
 |  | 
 | 
											
												
													
														|  | -#endif
 |  | 
 | 
											
												
													
														|  |  	default:
 |  |  	default:
 | 
											
												
													
														|  |  	break;
 |  |  	break;
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
										
											
												
													
														|  | @@ -332,20 +321,6 @@ static snmp_err_t signal_set_value(struct snmp_node_instance* instance, u16_t le
 | 
											
												
													
														|  |    			log_event_data(LOG_SHUTDOWN_UPS, "Администратор");
 |  |    			log_event_data(LOG_SHUTDOWN_UPS, "Администратор");
 | 
											
												
													
														|  |    	  }
 |  |    	  }
 | 
											
												
													
														|  |    	  break;
 |  |    	  break;
 | 
											
												
													
														|  | -#ifdef HARDWARE_BT6706
 |  | 
 | 
											
												
													
														|  | -	case 19: /* DO2*/
 |  | 
 | 
											
												
													
														|  | -		if(sSettings.sInOuts.ro_type_source[2] == SNMP_SET){
 |  | 
 | 
											
												
													
														|  | -			  val_string = (char*)value;
 |  | 
 | 
											
												
													
														|  | -			  SetROStr(val_string, 2);
 |  | 
 | 
											
												
													
														|  | -			  if(val_string[0] == 0x31)
 |  | 
 | 
											
												
													
														|  | -				  strcat(str, "Замкнуто");
 |  | 
 | 
											
												
													
														|  | -			  else
 |  | 
 | 
											
												
													
														|  | -				  strcat(str, "Разомкнуто");
 |  | 
 | 
											
												
													
														|  | -			//  SNMP_SendUserTrap(DO1_TOGGLED);
 |  | 
 | 
											
												
													
														|  | -			  log_event_data(LOG_DO2_STATE, str);
 |  | 
 | 
											
												
													
														|  | -		  }
 |  | 
 | 
											
												
													
														|  | -		break;
 |  | 
 | 
											
												
													
														|  | -#endif
 |  | 
 | 
											
												
													
														|  |        default :
 |  |        default :
 | 
											
												
													
														|  |      	  return SNMP_ERR_GENERROR;
 |  |      	  return SNMP_ERR_GENERROR;
 | 
											
												
													
														|  |        break;
 |  |        break;
 | 
											
										
											
												
													
														|  | @@ -414,25 +389,14 @@ static snmp_err_t signal_set_test(struct snmp_node_instance* instance, u16_t len
 | 
											
												
													
														|  |    		   }
 |  |    		   }
 | 
											
												
													
														|  |    		}
 |  |    		}
 | 
											
												
													
														|  |    	  break;
 |  |    	  break;
 | 
											
												
													
														|  | -#ifdef HARDWARE_BT6706
 |  | 
 | 
											
												
													
														|  | -	case 19: /* DO2*/
 |  | 
 | 
											
												
													
														|  | -		if ( len <= 1 )
 |  | 
 | 
											
												
													
														|  | -		{
 |  | 
 | 
											
												
													
														|  | -		   val_string = (char*)value;
 |  | 
 | 
											
												
													
														|  | -		   val_string[len] = 0;
 |  | 
 | 
											
												
													
														|  | -		   if(atoi(val_string) <= 1){
 |  | 
 | 
											
												
													
														|  | -			   if(sSettings.sInOuts.ro_type_source[2] == SNMP_SET)
 |  | 
 | 
											
												
													
														|  | -				 ret = SNMP_ERR_NOERROR;
 |  | 
 | 
											
												
													
														|  | -		   }
 |  | 
 | 
											
												
													
														|  | -		}
 |  | 
 | 
											
												
													
														|  | -		break;
 |  | 
 | 
											
												
													
														|  | -#endif
 |  | 
 | 
											
												
													
														|  |      };
 |  |      };
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |    return ret;
 |  |    return ret;
 | 
											
												
													
														|  |  }
 |  |  }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | 
 |  | +#endif
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  
 |  |  
 |