diff --git a/applications/external/barcode_gen/barcode_app.h b/applications/external/barcode_gen/barcode_app.h index bbc787f1e..3150bff1f 100644 --- a/applications/external/barcode_gen/barcode_app.h +++ b/applications/external/barcode_gen/barcode_app.h @@ -35,6 +35,9 @@ //the folder where the code 128 encoding table is located #define CODE128_DICT_FILE_PATH BARCODE_DATA_FILE_DIR_PATH "/code128_encodings.txt" +//the folder where the code 128 C encoding table is located +#define CODE128C_DICT_FILE_PATH BARCODE_DATA_FILE_DIR_PATH "/code128c_encodings.txt" + //the folder where the user stores their barcodes #define DEFAULT_USER_BARCODES EXT_PATH("apps_data/barcodes") @@ -85,4 +88,4 @@ uint32_t main_menu_callback(void* context); uint32_t exit_callback(void* context); -int32_t barcode_main(void* p); \ No newline at end of file +int32_t barcode_main(void* p); diff --git a/applications/external/barcode_gen/barcode_utils.c b/applications/external/barcode_gen/barcode_utils.c index d7bb12689..31274c1fe 100644 --- a/applications/external/barcode_gen/barcode_utils.c +++ b/applications/external/barcode_gen/barcode_utils.c @@ -43,6 +43,14 @@ void init_types() { code_128->start_pos = 0; barcode_type_objs[CODE128] = code_128; + BarcodeTypeObj* code_128c = malloc(sizeof(BarcodeTypeObj)); + code_128c->name = "CODE-128C"; + code_128c->type = CODE128C; + code_128c->min_digits = 2; + code_128c->max_digits = -1; + code_128c->start_pos = 0; + barcode_type_objs[CODE128C] = code_128c; + BarcodeTypeObj* codabar = malloc(sizeof(BarcodeTypeObj)); codabar->name = "Codabar"; codabar->type = CODABAR; @@ -82,6 +90,9 @@ BarcodeTypeObj* get_type(FuriString* type_string) { if(furi_string_cmp_str(type_string, "CODE-128") == 0) { return barcode_type_objs[CODE128]; } + if(furi_string_cmp_str(type_string, "CODE-128C") == 0) { + return barcode_type_objs[CODE128C]; + } if(furi_string_cmp_str(type_string, "Codabar") == 0) { return barcode_type_objs[CODABAR]; } @@ -133,4 +144,4 @@ const char* get_error_code_message(ErrorCode error_code) { default: return "Could not read barcode data"; }; -} \ No newline at end of file +} diff --git a/applications/external/barcode_gen/barcode_utils.h b/applications/external/barcode_gen/barcode_utils.h index 7bc565cee..0a27785cf 100644 --- a/applications/external/barcode_gen/barcode_utils.h +++ b/applications/external/barcode_gen/barcode_utils.h @@ -3,7 +3,7 @@ #include #include -#define NUMBER_OF_BARCODE_TYPES 7 +#define NUMBER_OF_BARCODE_TYPES 8 typedef enum { WrongNumberOfDigits, //There is too many or too few digits in the barcode @@ -22,6 +22,7 @@ typedef enum { EAN13, CODE39, CODE128, + CODE128C, CODABAR, UNKNOWN @@ -51,4 +52,4 @@ void init_types(); void free_types(); BarcodeTypeObj* get_type(FuriString* type_string); const char* get_error_code_name(ErrorCode error_code); -const char* get_error_code_message(ErrorCode error_code); \ No newline at end of file +const char* get_error_code_message(ErrorCode error_code); diff --git a/applications/external/barcode_gen/barcode_validator.c b/applications/external/barcode_gen/barcode_validator.c index 51e71ae2e..cb493f3e9 100644 --- a/applications/external/barcode_gen/barcode_validator.c +++ b/applications/external/barcode_gen/barcode_validator.c @@ -13,6 +13,9 @@ void barcode_loader(BarcodeData* barcode_data) { case CODE128: code_128_loader(barcode_data); break; + case CODE128C: + code_128c_loader(barcode_data); + break; case CODABAR: codabar_loader(barcode_data); break; @@ -39,6 +42,7 @@ int calculate_check_digit(BarcodeData* barcode_data) { break; case CODE39: case CODE128: + case CODE128C: case CODABAR: case UNKNOWN: default: @@ -345,6 +349,131 @@ void code_128_loader(BarcodeData* barcode_data) { furi_string_free(barcode_bits); } +/** + * Loads a code 128 C barcode +*/ +void code_128c_loader(BarcodeData* barcode_data) { + int barcode_length = furi_string_size(barcode_data->raw_data); + + //the start code for character set C + int start_code_value = 105; + + //The bits for the start code + const char* start_code_bits = "11010011100"; + + //The bits for the stop code + const char* stop_code_bits = "1100011101011"; + + int min_digits = barcode_data->type_obj->min_digits; + + int checksum_adder = start_code_value; + int checksum_digits = 0; + + //the calculated check digit + int final_check_digit = 0; + + // check the length of the barcode, must contain atleast 2 character, + // this can have as many characters as it wants, it might not fit on the screen + // code 128 C: the length must be even + if((barcode_length < min_digits) || (barcode_length & 1)) { + barcode_data->reason = WrongNumberOfDigits; + barcode_data->valid = false; + return; + } + //Open Storage + Storage* storage = furi_record_open(RECORD_STORAGE); + FlipperFormat* ff = flipper_format_file_alloc(storage); + + FuriString* barcode_bits = furi_string_alloc(); + + //add the start code + furi_string_cat(barcode_bits, start_code_bits); + + if(!flipper_format_file_open_existing(ff, CODE128C_DICT_FILE_PATH)) { + FURI_LOG_E(TAG, "c128c Could not open file %s", CODE128C_DICT_FILE_PATH); + barcode_data->reason = MissingEncodingTable; + barcode_data->valid = false; + } else { + FuriString* value = furi_string_alloc(); + FuriString* char_bits = furi_string_alloc(); + for(int i = 0; i < barcode_length; i += 2) { + char barcode_char1 = furi_string_get_char(barcode_data->raw_data, i); + char barcode_char2 = furi_string_get_char(barcode_data->raw_data, i + 1); + FURI_LOG_I(TAG, "c128c bc1='%c' bc2='%c'", barcode_char1, barcode_char2); + + char current_chars[4]; + snprintf(current_chars, 3, "%c%c", barcode_char1, barcode_char2); + FURI_LOG_I(TAG, "c128c current_chars='%s'", current_chars); + + //using the value of the characters, get the characters bits + if(!flipper_format_read_string(ff, current_chars, char_bits)) { + FURI_LOG_E(TAG, "c128c Could not read \"%s\" string", current_chars); + barcode_data->reason = EncodingTableError; + barcode_data->valid = false; + break; + } else { + //add the bits to the full barcode + furi_string_cat(barcode_bits, char_bits); + + // calculate the checksum + checksum_digits += 1; + checksum_adder += (atoi(current_chars) * checksum_digits); + + FURI_LOG_I( + TAG, + "c128c \"%s\" string: %s : %s : %d : %d : %d", + current_chars, + furi_string_get_cstr(char_bits), + furi_string_get_cstr(value), + checksum_digits, + (atoi(furi_string_get_cstr(value)) * checksum_digits), + checksum_adder); + } + //bring the file pointer back to the begining + flipper_format_rewind(ff); + } + //calculate the check digit and convert it into a c string for lookup in the encoding table + final_check_digit = checksum_adder % 103; + FURI_LOG_I(TAG, "c128c finale_check_digit=%d", final_check_digit); + + int length = snprintf(NULL, 0, "%d", final_check_digit); + if(final_check_digit < 100) length = 2; + char* final_check_digit_string = malloc(length + 1); + snprintf(final_check_digit_string, length + 1, "%02d", final_check_digit); + + //after the checksum has been calculated, add the bits to the full barcode + if(!flipper_format_read_string(ff, final_check_digit_string, char_bits)) { + FURI_LOG_E(TAG, "c128c cksum Could not read \"%s\" string", final_check_digit_string); + barcode_data->reason = EncodingTableError; + barcode_data->valid = false; + } else { + //add the check digit bits to the full barcode + furi_string_cat(barcode_bits, char_bits); + + FURI_LOG_I( + TAG, + "check digit \"%s\" string: %s", + final_check_digit_string, + furi_string_get_cstr(char_bits)); + } + + free(final_check_digit_string); + furi_string_free(value); + furi_string_free(char_bits); + } + + //add the stop code + furi_string_cat(barcode_bits, stop_code_bits); + + //Close Storage + flipper_format_free(ff); + furi_record_close(RECORD_STORAGE); + + FURI_LOG_I(TAG, "c128c %s", furi_string_get_cstr(barcode_bits)); + furi_string_cat(barcode_data->correct_data, barcode_bits); + furi_string_free(barcode_bits); +} + void codabar_loader(BarcodeData* barcode_data) { int barcode_length = furi_string_size(barcode_data->raw_data); @@ -400,4 +529,4 @@ void codabar_loader(BarcodeData* barcode_data) { furi_string_cat(barcode_data->correct_data, barcode_bits); furi_string_free(barcode_bits); -} \ No newline at end of file +} diff --git a/applications/external/barcode_gen/barcode_validator.h b/applications/external/barcode_gen/barcode_validator.h index 739c80ddf..2138124dd 100644 --- a/applications/external/barcode_gen/barcode_validator.h +++ b/applications/external/barcode_gen/barcode_validator.h @@ -10,5 +10,6 @@ void ean_8_loader(BarcodeData* barcode_data); void ean_13_loader(BarcodeData* barcode_data); void code_39_loader(BarcodeData* barcode_data); void code_128_loader(BarcodeData* barcode_data); +void code_128c_loader(BarcodeData* barcode_data); void codabar_loader(BarcodeData* barcode_data); -void barcode_loader(BarcodeData* barcode_data); \ No newline at end of file +void barcode_loader(BarcodeData* barcode_data); diff --git a/applications/external/barcode_gen/views/barcode_view.c b/applications/external/barcode_gen/views/barcode_view.c index 994053801..55ab52046 100644 --- a/applications/external/barcode_gen/views/barcode_view.c +++ b/applications/external/barcode_gen/views/barcode_view.c @@ -406,6 +406,7 @@ static void barcode_draw_callback(Canvas* canvas, void* ctx) { draw_code_39(canvas, data); break; case CODE128: + case CODE128C: draw_code_128(canvas, data); break; case CODABAR: @@ -506,4 +507,4 @@ void barcode_free(Barcode* barcode) { View* barcode_get_view(Barcode* barcode) { furi_assert(barcode); return barcode->view; -} \ No newline at end of file +}