Преглед изворни кода

drobne upravy implementacie nBus

Juraj Ďuďák пре 2 година
родитељ
комит
b13977df57
2 измењених фајлова са 2 додато и 4 уклоњено
  1. 1 1
      Inc/app_bridge.h
  2. 1 3
      Src/nbus_impl.c

+ 1 - 1
Inc/app_bridge.h

@@ -43,7 +43,7 @@ typedef struct{
 	void (*reset)();
 	nBus_sensorType_t(*getType)(uint8_t sensor_index);
 	uint8_t (*getSensorCount)();
-	uint8_t (*getData)(uint8_t *data);
+	uint8_t (*getData)(uint8_t sensor_index, uint8_t *data);
 	uint8_t (*setData)(uint8_t *data);
 	uint8_t (*hasParam)(uint8_t sensor_index, nBus_param_t param_name);
 	uint8_t (*getParam)(uint8_t sensor_index, nBus_param_t param_name);

+ 1 - 3
Src/nbus_impl.c

@@ -41,8 +41,6 @@ void nbus_unicastToSensorGet(nBus_TypeDef *nbus){
 					nbus->tx_buffer[5+2*i] = nbus->interface->getParam(i, params[i]);
 					nbus->tx_length += 2;
 				}
-				nbus->tx_buffer[4] = nbus->interface->getParam(nbus->rx_buffer[3], (nBus_param_t)nbus->tx_buffer[4]);
-				nbus->tx_length += 1;
 			}
 
 		}
@@ -51,7 +49,7 @@ void nbus_unicastToSensorGet(nBus_TypeDef *nbus){
 
 	case CMD_DATA:
 	{
-		uint8_t cnt = nbus->interface->getData(&nbus->tx_buffer[4]);
+		uint8_t cnt = nbus->interface->getData(nbus->sensorInfo.address, &nbus->tx_buffer[4]);
 		nbus->tx_length += cnt;
 	}
 	break;