aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2018-08-26 14:28:37 +0300
committerShlomo Hecht <shlomo@twine-s.com>2018-08-26 14:28:37 +0300
commit1fdc92d718ee8e0087b5846e54bbff983ef27d39 (patch)
tree5f990bfdbeeb1b378cdff449968fdfd3c3152ba0 /Software/Embedded_SW/Embedded/Modules
parent6e2fbaffeec9d6e3518ea9706eea107a4f1b348c (diff)
downloadTango-1fdc92d718ee8e0087b5846e54bbff983ef27d39.tar.gz
Tango-1fdc92d718ee8e0087b5846e54bbff983ef27d39.zip
read real time stub
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c10
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Stubs_Handler/StubRealTimeUsage.c14
2 files changed, 14 insertions, 10 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
index 1eabcdeba..1bce3a39d 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -180,7 +180,7 @@ void DiagnosticLoadTemperature(int HeaterId, int temperature)
}
void DiagnosticLoadSpeedSensor(uint32_t value)
{
- SpeedValue[SpeedCounterIndex] = value/100;
+ SpeedValue[SpeedCounterIndex] = value;
SpeedCounterIndex++;
if (SpeedCounterIndex>=DIAGNOSTICS_DANCER_LIMIT )
SpeedCounterIndex = 0;
@@ -401,7 +401,7 @@ void SendDiagnostics(void)
int i;
DiagnosticsMonitor.n_dispensersmotorsfrequency = 0;
- /*
+ /**/
if (JobIsActive())
{
j++;
@@ -418,9 +418,9 @@ void SendDiagnostics(void)
}
}
}
- */
+ /**/
DiagnosticsMonitor.n_dispenserspressure = 0;
- /*
+ /**/
DiagnosticsMonitor.n_dispenserspressure = MAX_SYSTEM_DISPENSERS;
if (DiagnosticsMonitor.dispenserspressure)
{
@@ -433,7 +433,7 @@ void SendDiagnostics(void)
DiagnosticsMonitor.dispenserspressure[i] = &DiagnosticsDispenserPressure[i];
}
}
-*/
+ /**/
DiagnosticsMonitor.n_dispenserslinearpositions = 0;
DiagnosticsMonitor.n_dispensersangularencoders = 0;
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/StubRealTimeUsage.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/StubRealTimeUsage.c
index 997d67973..22c8432b6 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/StubRealTimeUsage.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/StubRealTimeUsage.c
@@ -46,20 +46,24 @@ void Stub_RealTimeUsageRequest(MessageContainer* requestContainer)
StubRealTimeUsageResponse response = STUB_REAL_TIME_USAGE_RESPONSE__INIT;
- responseContainer = createContainer(MESSAGE_TYPE__StubRealTimeUsageResponse, requestContainer->token, true, &response, &stub_real_time_usage_response__pack, &stub_real_time_usage_response__get_packed_size);
uint32_t Percentile[101] = {0};
- IdleTaskGetLoadTable(Percentile);
response.n_percentile = 100;
- response.percentile = Percentile;
+ response.percentile = malloc(sizeof(response.percentile)*response.n_percentile);
+ if (response.percentile)
+ IdleTaskGetLoadTable(response.percentile);
+ else
+ response.n_percentile = 0;
//free(request);
//-------------------------------------------------------------------------------------------
+ responseContainer = createContainer(MESSAGE_TYPE__StubRealTimeUsageResponse, requestContainer->token, true, &response, &stub_real_time_usage_response__pack, &stub_real_time_usage_response__get_packed_size);
uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
size_t container_size = message_container__pack(&responseContainer, container_buffer);
free(responseContainer.data.data);
SendChars((char*)container_buffer, container_size);
- //free(container_buffer);
- //free(requestContainer);
+ if (response.percentile)
+ free(response.percentile);
+
stub_real_time_usage_request__free_unpacked(request,NULL);
}