diff --git a/build/libraries/camera/ARM7/convert_micron.pl b/build/libraries/camera/ARM7/convert_micron.pl index ecf6c27..60ba408 100644 --- a/build/libraries/camera/ARM7/convert_micron.pl +++ b/build/libraries/camera/ARM7/convert_micron.pl @@ -199,6 +199,25 @@ my $comp_target =<<'EOF'; \} EOF +# 改行調整 +$file_head_format =~ s/\r?\n/\r\n/g; +$file_foot_format =~ s/\r?\n/\r\n/g; +$declare_format =~ s/\r?\n/\r\n/g; +$func_head_format =~ s/\r?\n/\r\n/g; +$func_foot_format =~ s/\r?\n/\r\n/g; +$call_format =~ s/\r?\n/\r\n/g; +$reg_format =~ s/\r?\n/\r\n/g; +$set_format =~ s/\r?\n/\r\n/g; +$clear_format =~ s/\r?\n/\r\n/g; +$delay_format =~ s/\r?\n/\r\n/g; +$pollreg_format =~ s/\r?\n/\r\n/g; +$mcu_format =~ s/\r?\n/\r\n/g; +$fieldset_format =~ s/\r?\n/\r\n/g; +$fieldclear_format =~ s/\r?\n/\r\n/g; +$pollfield_format =~ s/\r?\n/\r\n/g; +$comp_target =~ s/\r?\n/\r\n/g; + + # API別データベース # name: API名 (最初のAPIより手前は無名) # data: API本体 (文字列の結合形式) diff --git a/build/libraries/camera/ARM7/convert_sharp.pl b/build/libraries/camera/ARM7/convert_sharp.pl index 69d2827..ec37231 100644 --- a/build/libraries/camera/ARM7/convert_sharp.pl +++ b/build/libraries/camera/ARM7/convert_sharp.pl @@ -62,6 +62,13 @@ my $multi_foot_format =<<'EOF'; } EOF +# 改行調整 +$file_head_format =~ s/\r?\n/\r\n/g; +$file_foot_format =~ s/\r?\n/\r\n/g; +$single_format =~ s/\r?\n/\r\n/g; +$multi_head_format =~ s/\r?\n/\r\n/g; +$multi_foot_format =~ s/\r?\n/\r\n/g; + my $row_nums = 8; sub sprint_command { my($addr, @value) = @_; @@ -140,6 +147,10 @@ push @output, sprint_command($start, @cache) if (@cache); # 入力処理終了 close IN; +for (my $i = 0; $i < @output; $i++) { + $output[$i] =~ s/\r?\n/\r\n/g; +} + # 出力処理 $outfile =~ s/^.*[\\\/]//; # get basename to print printf OUT $file_head_format, $outfile; # ファイルヘッダ出力