From 4779fe4b337598c14a1d38c47092ec42bfb130ce Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Mon, 5 Nov 2018 16:15:56 +0200 Subject: replace malloc and free to my_malloc and my_free in all source but stubs folder. some fixes to the job stub --- .../Embedded/Common/SWUpdate/FileSystem.c | 35 +++++++++++----------- 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c') diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c index 6324c904e..ec079ff74 100644 --- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c +++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c @@ -83,9 +83,9 @@ uint32_t FileUploadRequestFunc(MessageContainer* requestContainer) responseContainer.errormessage = "JOb Active or incorrect parameters"; } responseContainer.continuous = false; - uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer)); + uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer)); size_t container_size = message_container__pack(&responseContainer, container_buffer); - free(responseContainer.data.data); + my_free(responseContainer.data.data); SendChars(container_buffer, container_size); return OK; @@ -154,9 +154,9 @@ uint32_t FileChunkUploadRequestFunc(MessageContainer* requestContainer) responseContainer.errormessage = "JOb Active or incorrect parameters"; } responseContainer.continuous = false; - uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer)); + uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer)); size_t container_size = message_container__pack(&responseContainer, container_buffer); - free(responseContainer.data.data); + my_free(responseContainer.data.data); SendChars(container_buffer, container_size); return OK; @@ -179,9 +179,9 @@ uint32_t ExecuteProcessRequestFunc(MessageContainer* requestContainer) responseContainer.errormessage = "JOb Active or incorrect parameters"; } responseContainer.continuous = false; - uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer)); + uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer)); size_t container_size = message_container__pack(&responseContainer, container_buffer); - free(responseContainer.data.data); + my_free(responseContainer.data.data); SendChars(container_buffer, container_size); return OK; @@ -204,9 +204,9 @@ uint32_t KillProcessRequestFunc(MessageContainer* requestContainer) responseContainer.errormessage = "JOb Active or incorrect parameters"; } responseContainer.continuous = false; - uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer)); + uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer)); size_t container_size = message_container__pack(&responseContainer, container_buffer); - free(responseContainer.data.data); + my_free(responseContainer.data.data); SendChars(container_buffer, container_size); return OK; @@ -258,9 +258,9 @@ uint32_t CreateRequestFunc(MessageContainer* requestContainer) responseContainer.errormessage = ErrorMsg; } responseContainer.continuous = false; - uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer)); + uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer)); size_t container_size = message_container__pack(&responseContainer, container_buffer); - free(responseContainer.data.data); + my_free(responseContainer.data.data); SendChars(container_buffer, container_size); return OK; @@ -324,9 +324,9 @@ uint32_t DeleteRequestFunc(MessageContainer* requestContainer) responseContainer.errormessage = "JOb Active or incorrect parameters"; } responseContainer.continuous = false; - uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer)); + uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer)); size_t container_size = message_container__pack(&responseContainer, container_buffer); - free(responseContainer.data.data); + my_free(responseContainer.data.data); SendChars(container_buffer, container_size); return OK; @@ -367,9 +367,9 @@ uint32_t GetStorageInfoRequestFunc(MessageContainer* requestContainer) responseContainer.errormessage = "JOb Active or incorrect parameters"; } responseContainer.continuous = false; - uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer)); + uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer)); size_t container_size = message_container__pack(&responseContainer, container_buffer); - free(responseContainer.data.data); + my_free(responseContainer.data.data); SendChars(container_buffer, container_size); return OK; @@ -390,7 +390,7 @@ uint32_t GetFilesRequestFunc(MessageContainer* requestContainer) int NumOfFiles = 0; FRESULT Fresult = FR_OK; - FileInfo **FilesInfo = (FileInfo**)malloc(sizeof(FileInfo *)*(MAX_NUM_OF_FILES)); + FileInfo **FilesInfo = (FileInfo**)my_malloc(sizeof(FileInfo *)*(MAX_NUM_OF_FILES)); FileInfo Data[MAX_NUM_OF_FILES]; Fresult = f_stat(request->path,fno[0]); if (Fresult == FR_OK) @@ -441,9 +441,10 @@ uint32_t GetFilesRequestFunc(MessageContainer* requestContainer) responseContainer.errormessage = "JOb Active or incorrect parameters"; } responseContainer.continuous = false; - uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer)); + uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer)); size_t container_size = message_container__pack(&responseContainer, container_buffer); - free(responseContainer.data.data); + my_free(responseContainer.data.data); + my_free(FilesInfo); SendChars(container_buffer, container_size); return OK; -- cgit v1.3.1 From 7a0d85d98397780aab9909550028f2a51811c184 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Wed, 7 Nov 2018 12:03:11 +0200 Subject: job resume fix. rockers --- .../Embedded/Common/SWUpdate/FileSystem.c | 14 +++++++++--- .../Modules/Diagnostics/DiagnosticActions.c | 25 ---------------------- .../Embedded/Modules/Thread/Thread_print.c | 4 ++-- .../Embedded/StateMachines/Printing/JobSTM.c | 2 +- 4 files changed, 14 insertions(+), 31 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c') diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c index 724522b75..78fba3c49 100644 --- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c +++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c @@ -86,6 +86,7 @@ uint32_t FileUploadRequestFunc(MessageContainer* requestContainer) uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer)); size_t container_size = message_container__pack(&responseContainer, container_buffer); my_free(responseContainer.data.data); + file_upload_request__free_unpacked(request,NULL); SendChars(container_buffer, container_size); return OK; @@ -156,6 +157,7 @@ uint32_t FileChunkUploadRequestFunc(MessageContainer* requestContainer) responseContainer.continuous = false; uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer)); size_t container_size = message_container__pack(&responseContainer, container_buffer); + file_chunk_upload_request__free_unpacked(request,NULL); my_free(responseContainer.data.data); SendChars(container_buffer, container_size); @@ -181,6 +183,7 @@ uint32_t ExecuteProcessRequestFunc(MessageContainer* requestContainer) responseContainer.continuous = false; uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer)); size_t container_size = message_container__pack(&responseContainer, container_buffer); + execute_process_request__free_unpacked(request,NULL); my_free(responseContainer.data.data); SendChars(container_buffer, container_size); @@ -207,6 +210,7 @@ uint32_t KillProcessRequestFunc(MessageContainer* requestContainer) uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer)); size_t container_size = message_container__pack(&responseContainer, container_buffer); my_free(responseContainer.data.data); + kill_process_request__free_unpacked(request,NULL); SendChars(container_buffer, container_size); return OK; @@ -261,6 +265,7 @@ uint32_t CreateRequestFunc(MessageContainer* requestContainer) uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer)); size_t container_size = message_container__pack(&responseContainer, container_buffer); my_free(responseContainer.data.data); + create_request__free_unpacked(request,NULL); SendChars(container_buffer, container_size); return OK; @@ -327,6 +332,7 @@ uint32_t DeleteRequestFunc(MessageContainer* requestContainer) uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer)); size_t container_size = message_container__pack(&responseContainer, container_buffer); my_free(responseContainer.data.data); + delete_request__free_unpacked(request,NULL); SendChars(container_buffer, container_size); return OK; @@ -370,6 +376,7 @@ uint32_t GetStorageInfoRequestFunc(MessageContainer* requestContainer) uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer)); size_t container_size = message_container__pack(&responseContainer, container_buffer); my_free(responseContainer.data.data); + get_storage_info_request__free_unpacked(request,NULL); SendChars(container_buffer, container_size); return OK; @@ -392,7 +399,7 @@ uint32_t GetFilesRequestFunc(MessageContainer* requestContainer) FileInfo **FilesInfo = (FileInfo**)my_malloc(sizeof(FileInfo *)*(MAX_NUM_OF_FILES)); FileInfo Data[MAX_NUM_OF_FILES]; - fno[0] = malloc(sizeof(FILINFO)); + fno[0] = my_malloc(sizeof(FILINFO)); memset (fno[0],0,sizeof(FILINFO)); Fresult = f_stat(request->path,fno[0]); if (Fresult == FR_OK) @@ -406,7 +413,7 @@ uint32_t GetFilesRequestFunc(MessageContainer* requestContainer) { for (NumOfFiles = 1;NumOfFiles < MAX_NUM_OF_FILES;NumOfFiles++) { - fno[NumOfFiles] = malloc(sizeof(FILINFO)); + fno[NumOfFiles] = my_malloc(sizeof(FILINFO)); memset (fno[NumOfFiles],0,sizeof(FILINFO)); Fresult = f_readdir(&dir, &fno[NumOfFiles]); /* Read a directory item */ if (Fresult == FR_OK) @@ -449,11 +456,12 @@ uint32_t GetFilesRequestFunc(MessageContainer* requestContainer) size_t container_size = message_container__pack(&responseContainer, container_buffer); my_free(responseContainer.data.data); my_free(FilesInfo); + get_files_request__free_unpacked(request,NULL); SendChars(container_buffer, container_size); for (NumOfFiles = 0;NumOfFiles < MAX_NUM_OF_FILES;NumOfFiles++) { if (fno[NumOfFiles]) - free (fno[NumOfFiles]); + my_free (fno[NumOfFiles]); } return OK; } diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticActions.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticActions.c index 0fb314372..0cdf5635d 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticActions.c +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticActions.c @@ -185,30 +185,5 @@ uint32_t SetDigitalOutRequestRequestFunc(MessageContainer* requestContainer) return OK; } -/* case: - break; - INTERFACE_IOS__GPO_MIXCHIP_SSR4_CTRL - INTERFACE_IOS__GPO_DYEINGH_SSR5_CTRL - INTERFACE_IOS__GPO_DYEINGH_SSR6_CTRL - INTERFACE_IOS__GPO_DYEINGH_SSR7_CTRL - INTERFACE_IOS__GPO_DYEINGH_SSR8_CTRL - INTERFACE_IOS__GPO_DRYER_SSR1_CTRL - INTERFACE_IOS__GPO_DRYER_SSR2_CTRL - INTERFACE_IOS__GPO_DRYER_SSR3_CTRL - INTERFACE_IOS__GPO_PDOWN_RL1_CTRL - INTERFACE_IOS__GPO_SPARE_SSR12_CTRL - INTERFACE_IOS__GPO_SPARE_SSR13_CTRL - INTERFACE_IOS__GPO_DILUTORPUMP_SSR10_CTRL - INTERFACE_IOS__GPO_WASTECH_PUMP2 - INTERFACE_IOS__GPO_BUZZER - INTERFACE_IOS__GPO_LED1 - INTERFACE_IOS__GPO_LED2 - INTERFACE_IOS__GPO_LED3 - INTERFACE_IOS__GPO_LED4 - INTERFACE_IOS__GPO_TFEED_BREAK_1 - INTERFACE_IOS__GPO_BLOWER_PWM - INTERFACE_IOS__GPO_CHILLER_SSR9_CTRL - INTERFACE_IOS__GPO_WHS_WTANKPUMP2 - */ diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index 175cfcc7d..22f54eb50 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -672,12 +672,12 @@ uint32_t ThreadPreSegmentState(void *JobDetails) if (MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_RLOADING].maxfrequency > 0) { MotorSetDirection((TimerMotors_t)HARDWARE_MOTOR_TYPE__MOTO_RLOADING,MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_RLOADING].directionthreadwize); - MotorSetSpeed(HARDWARE_MOTOR_TYPE__MOTO_RLOADING, 2); + MotorSetSpeed(HARDWARE_MOTOR_TYPE__MOTO_RLOADING, 1); } if (MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_LLOADING].maxfrequency > 0) { MotorSetDirection((TimerMotors_t)HARDWARE_MOTOR_TYPE__MOTO_LLOADING,MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_LLOADING].directionthreadwize); - MotorSetSpeed(HARDWARE_MOTOR_TYPE__MOTO_LLOADING, 2); + MotorSetSpeed(HARDWARE_MOTOR_TYPE__MOTO_LLOADING, 1); } // #warning rocker disabled diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c index f4b83a3cf..02a24c642 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c @@ -575,7 +575,7 @@ void SendJobProgress(double ProcessedLength, int SegmentId, bool done, char *Mes if (JobResumed == true) { resumeresponse.status = &jobStatus; - responseContainer = createContainer(MESSAGE_TYPE__ResumeCurrentJobResponse, JobToken, done, &response, &resume_current_job_response__pack, &resume_current_job_response__get_packed_size); + responseContainer = createContainer(MESSAGE_TYPE__ResumeCurrentJobResponse, JobToken, done, &resumeresponse, &resume_current_job_response__pack, &resume_current_job_response__get_packed_size); } else { -- cgit v1.3.1