j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Crc fix and update (#347)

Browse source 
Update crc example API and config.
This commit is contained in:
Zaltora 2017-02-27 17:35:56 +01:00 committed by Ruslan V. Uss
parent f51a2109b1
commit fda5d0b942
3 changed files with 44 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
examples/crc_example/crc_config_user.h Normal file
View file

@ -0,0 +1,25 @@
/*
* perso_config.h
*
* Created on: 11 févr. 2017
* Author: lilian
*/
#ifndef CRC_CONFIG_USER_H_
#define CRC_CONFIG_USER_H_
#include "espressif/esp_common.h"
#include "FreeRTOS.h"
#define CRC_DEBUG 0
#define CRC_1BYTE_SUPPORT 1
#define CRC_4BYTE_SUPPORT 0
#define CRC_8BYTE_SUPPORT 0
typedef uint8_t crc_8;
typedef uint16_t crc_16;
typedef uint32_t crc_32;
typedef uint64_t crc_64;
#endif /* CRC_CONFIG_USER_H_ */

39
examples/crc_example/crc_main.c
View file

@ -9,25 +9,24 @@
#include "esp8266.h" #include "esp8266.h"
#include <esp/hwrand.h> #include <esp/hwrand.h>
//extras //crc lib
#include "crc_config_perso.h" #include "crc_generic.h"
#define NUMBER_COMPUTE_TEST 1000 #define NUMBER_COMPUTE_TEST 1000
unsigned char check_data[] = { "123456789" }; unsigned char check_data[] = { "123456789" };
uint8_t tab_data[512]; // uint8_t tab_data[512];
void crc_8bit(void *pvParameters) { void crc_8bit(void *pvParameters) {
config_crc_8 customcrc ; // my crc object config_crc_8 customcrc ; // my crc object
uint8_t tabsrc[256]; // my crc look-up table crc_8 tabsrc[256]; // my crc look-up table
//init crc parameters (MAXIM parameters) //init crc parameters (MAXIM parameters)
crc_8_generic_init(&customcrc,0x31, 8, 0x00, 0x00, 1, 1, 1); crc_8_generic_init(&customcrc,0x31, 8, 0x00, 0x00, 1, 1, 1);
// Use table algorithm / generate table //generate table
crc_8_generic_select_algo(&customcrc, tabsrc, CRC_TABLE, 0); crc_8_generate_table(&customcrc, tabsrc, sizeof(tabsrc));
//show setting of crc //show setting of crc
printf("\nCRC library v1.0 written on 11/02/2017 by Zaltora\n"); printf("\nCRC library v1.0 written on 11/02/2017 by Zaltora\n");
@ -45,7 +44,6 @@ void crc_8bit(void *pvParameters) {
printf("check_data : '%s' (%d bytes)\n", check_data, sizeof(check_data)); printf("check_data : '%s' (%d bytes)\n", check_data, sizeof(check_data));
printf("\n"); printf("\n");
//show table //show table
printf("Lookup table generated:\n"); printf("Lookup table generated:\n");
printf("\n"); printf("\n");
@ -61,15 +59,15 @@ void crc_8bit(void *pvParameters) {
printf("\n"); printf("\n");
//try different crc algorithm //try different crc algorithm
crc_8_generic_select_algo(&customcrc, (crc_8*)tabsrc, CRC_TABLE, 0); crc_8_generic_select_algo(&customcrc, tabsrc, sizeof(tabsrc), CRC_TABLE);
printf("CRC_TABLE\t\t: 0x%02X\n", crc_8_generic_compute(&customcrc, check_data, sizeof(check_data))); printf("CRC_TABLE\t\t: 0x%02X\n", crc_8_generic_compute(&customcrc, check_data, sizeof(check_data)));
crc_8_generic_select_algo(&customcrc, (crc_8*)tabsrc, CRC_TABLE_FAST, 0); crc_8_generic_select_algo(&customcrc, tabsrc, sizeof(tabsrc), CRC_TABLE_FAST);
printf("CRC_TABLE_FAST\t\t: 0x%02X\n", crc_8_generic_compute(&customcrc, check_data, sizeof(check_data))); printf("CRC_TABLE_FAST\t\t: 0x%02X\n", crc_8_generic_compute(&customcrc, check_data, sizeof(check_data)));
crc_8_generic_select_algo(&customcrc, NULL, CRC_BIT_TO_BIT, 0); crc_8_generic_select_algo(&customcrc, NULL, 0, CRC_BIT_TO_BIT);
printf("CRC_BIT_TO_BIT\t\t: 0x%02X\n", crc_8_generic_compute(&customcrc, check_data, sizeof(check_data))); printf("CRC_BIT_TO_BIT\t\t: 0x%02X\n", crc_8_generic_compute(&customcrc, check_data, sizeof(check_data)));
crc_8_generic_select_algo(&customcrc, NULL, CRC_BIT_TO_BIT_FAST, 0); crc_8_generic_select_algo(&customcrc, NULL, 0, CRC_BIT_TO_BIT_FAST);
printf("CRC_BIT_TO_BIT_FAST\t: 0x%02X\n", crc_8_generic_compute(&customcrc, check_data, sizeof(check_data))); printf("CRC_BIT_TO_BIT_FAST\t: 0x%02X\n", crc_8_generic_compute(&customcrc, check_data, sizeof(check_data)));
crc_8_generic_select_algo(&customcrc, (crc_8*)crc_8_tab_MAXIM, CRC_TABLE_FAST, 1); crc_8_generic_select_algo(&customcrc, crc_8_tab_MAXIM, sizeof(crc_8_tab_MAXIM), CRC_TABLE_FAST);
printf("CRC_TABLE_BUILTIN\t: 0x%02X\n\n", crc_8_generic_compute(&customcrc, check_data, sizeof(check_data))); printf("CRC_TABLE_BUILTIN\t: 0x%02X\n\n", crc_8_generic_compute(&customcrc, check_data, sizeof(check_data)));
printf("Test speed algorithms with random data:\n"); printf("Test speed algorithms with random data:\n");
@ -94,27 +92,26 @@ void crc_8bit(void *pvParameters) {
{ {
switch(select){ switch(select){
case 0: case 0:
crc_8_generic_select_algo(&customcrc, NULL, CRC_BIT_TO_BIT, 0); crc_8_generic_select_algo(&customcrc, NULL, 0, CRC_BIT_TO_BIT);
sprintf(algo_txt,"CRC_BIT_TO_BIT"); sprintf(algo_txt,"CRC_BIT_TO_BIT");
break; break;
case 1: case 1:
crc_8_generic_select_algo(&customcrc, NULL, CRC_BIT_TO_BIT_FAST, 0); crc_8_generic_select_algo(&customcrc, NULL, 0, CRC_BIT_TO_BIT_FAST);
sprintf(algo_txt,"CRC_BIT_TO_BIT_FAST"); sprintf(algo_txt,"CRC_BIT_TO_BIT_FAST");
break; break;
case 2: case 2:
crc_8_generic_select_algo(&customcrc, tabsrc, CRC_TABLE, 0); crc_8_generic_select_algo(&customcrc, tabsrc, sizeof(tabsrc), CRC_TABLE);
sprintf(algo_txt,"CRC_TABLE"); sprintf(algo_txt,"CRC_TABLE");
break; break;
case 3: case 3:
crc_8_generic_select_algo(&customcrc, tabsrc, CRC_TABLE_FAST, 0); crc_8_generic_select_algo(&customcrc, tabsrc, sizeof(tabsrc), CRC_TABLE_FAST);
sprintf(algo_txt,"CRC_TABLE_FAST"); sprintf(algo_txt,"CRC_TABLE_FAST");
break; break;
case 4: case 4:
crc_8_generic_select_algo(&customcrc, (crc_8*)crc_8_tab_MAXIM, CRC_TABLE_FAST, 1); crc_8_generic_select_algo(&customcrc, crc_8_tab_MAXIM, sizeof(crc_8_tab_MAXIM), CRC_TABLE_FAST);
sprintf(algo_txt,"CRC_TABLE_FAST_BUILTIN"); sprintf(algo_txt,"CRC_TABLE_FAST_BUILTIN");
break; break;
} }
vTaskDelay(1000 / portTICK_PERIOD_MS) ;
printf("test speed algorithm %s \n",algo_txt); printf("test speed algorithm %s \n",algo_txt);
time = sdk_system_get_time(); time = sdk_system_get_time();
for (uint32_t i = 0 ; i < cst ; i++) for (uint32_t i = 0 ; i < cst ; i++)
@ -125,8 +122,8 @@ void crc_8bit(void *pvParameters) {
printf("Speed algorithm: %.3f us\n",(float)time/(float)cst); printf("Speed algorithm: %.3f us\n",(float)time/(float)cst);
printf("Result algorithm: %02X\n\n",result); printf("Result algorithm: %02X\n\n",result);
} }
while (1)
while (1) { {
vTaskDelay(10000 / portTICK_PERIOD_MS) ; vTaskDelay(10000 / portTICK_PERIOD_MS) ;
} }
} }

2
extras/crc_generic/crc_lib

@ -1 +1 @@
Subproject commit a3b902a53216b1378e5cc856ed1dfc3ffd38bc09 Subproject commit a97013c72f686735889b7a0908bbbf15a104f7d0