Compare commits

..

3 Commits

Author SHA1 Message Date
knb
bfd6adda42 libptouch: P700/P900 families, optional JSON config, ESC i z and print sequencing
- Add printer_family and profile flags; load overrides from printer_families.json
- Set ESC i z page byte from profile; pass prof into ptouch_fill_esc_iz
- End print with 0x1A only (drop FF prefix); extend Ruby FFI and CLI media info
- Add reference/ptp_raster_ref.adoc; install config under share/ptouch_label

Made-with: Cursor
2026-04-19 12:20:21 +09:00
knb
3f2eb464aa docs(samples): add QR/barcode merge template and CLI example
Add code.svg/code.yml placeholders for data-kb-placeholder qr/barcode.
Extend samples README with ptouch-label command using these files.

Made-with: Cursor
2026-04-19 10:07:27 +09:00
knb
f1779b94f0 feat(ruby): QR/Barcode merge placeholders in SVG templates
Add data-kb-placeholder qr/barcode support with rqrcode and barby.
Scale QR to fit placeholder box (viewBox + meet) and barcode by height
with natural width. Declare barby and rqrcode runtime dependencies.

Made-with: Cursor
2026-04-19 10:06:50 +09:00
25 changed files with 632 additions and 49 deletions

View File

@@ -27,6 +27,7 @@ set(LIBPTOUCH_SOURCES
src/lib/libptouch_usb.c src/lib/libptouch_usb.c
src/lib/libptouch_protocol.c src/lib/libptouch_protocol.c
src/lib/libptouch_layout.c src/lib/libptouch_layout.c
src/lib/libptouch_family_config.c
src/lib/libptouch_media_info.c src/lib/libptouch_media_info.c
src/lib/libptouch_trim.c src/lib/libptouch_trim.c
src/lib/libptouch_print.c src/lib/libptouch_print.c
@@ -82,6 +83,8 @@ add_executable(ptouch-protocol-regression-test
) )
target_include_directories(ptouch-protocol-regression-test PRIVATE target_include_directories(ptouch-protocol-regression-test PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/src/lib" "${CMAKE_CURRENT_SOURCE_DIR}/src/lib"
"${CMAKE_CURRENT_SOURCE_DIR}/include"
"${CMAKE_CURRENT_BINARY_DIR}/include"
) )
if(NOT MSVC) if(NOT MSVC)
target_compile_options(ptouch-protocol-regression-test PRIVATE -Wall -Wextra -Wpedantic) target_compile_options(ptouch-protocol-regression-test PRIVATE -Wall -Wextra -Wpedantic)
@@ -96,3 +99,6 @@ install(FILES
"${CMAKE_CURRENT_SOURCE_DIR}/include/libptouch.h" "${CMAKE_CURRENT_SOURCE_DIR}/include/libptouch.h"
"${CMAKE_CURRENT_BINARY_DIR}/include/libptouch_version.h" "${CMAKE_CURRENT_BINARY_DIR}/include/libptouch_version.h"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
install(FILES
"${CMAKE_CURRENT_SOURCE_DIR}/config/printer_families.json"
DESTINATION "${CMAKE_INSTALL_DATADIR}/ptouch_label")

View File

@@ -0,0 +1,18 @@
{
"families": {
"p700": {
"comment": "PT-P750W / PT-P710BTcv_ptp750w_710bt_jpn_raster_102.pdf 系)",
"print_dpi": 180,
"margin_feed_dpi": 180,
"margin_feed_max_dots": 900,
"send_esc_ia_cut_each": false
},
"p900": {
"comment": "PT-P900 / P900W / P950NW / P910BTcv_ptp900_jpn_raster_102.pdf 系)",
"print_dpi": 360,
"margin_feed_dpi": 360,
"margin_feed_max_dots": 1800,
"send_esc_ia_cut_each": true
}
}
}

View File

@@ -39,6 +39,18 @@ typedef enum {
LIBPTOUCH_ERR_IMAGE = 7, LIBPTOUCH_ERR_IMAGE = 7,
} libptouch_err_t; } libptouch_err_t;
/**
* リファレンス上の系統PT-P750W/P710BT = P700、PT-P900 系 = P900
* DPI の値で分岐する代わりに、この系統を使う。
*/
typedef enum {
LIBPTOUCH_FAMILY_UNKNOWN = 0,
/** PT-P750W / PT-P710BTcv_ptp750w_710bt_jpn_raster_102.pdf 系) */
LIBPTOUCH_FAMILY_P700 = 1,
/** PT-P900 / P900W / P950NW / P910BT 等cv_ptp900_jpn_raster_102.pdf 系) */
LIBPTOUCH_FAMILY_P900 = 2,
} libptouch_printer_family_t;
/** lsusb 例: PT-P900W — Brother Industries, Ltd (04f9:2085) */ /** lsusb 例: PT-P900W — Brother Industries, Ltd (04f9:2085) */
#define LIBPTOUCH_USB_VID_BROTHER 0x04f9u #define LIBPTOUCH_USB_VID_BROTHER 0x04f9u
#define LIBPTOUCH_USB_PID_PTP900W 0x2085u #define LIBPTOUCH_USB_PID_PTP900W 0x2085u
@@ -49,6 +61,11 @@ typedef enum {
libptouch_ctx *libptouch_create(void); libptouch_ctx *libptouch_create(void);
void libptouch_destroy(libptouch_ctx *ctx); void libptouch_destroy(libptouch_ctx *ctx);
/**
* 系統の短い英語ラベル("p700" / "p900" / "unknown"。UI やログ用。
*/
const char *libptouch_printer_family_label(libptouch_printer_family_t family);
/** 人が読める英語メッセージ(スレッド非安全: ctx ごと) */ /** 人が読める英語メッセージ(スレッド非安全: ctx ごと) */
const char *libptouch_strerror(const libptouch_ctx *ctx); const char *libptouch_strerror(const libptouch_ctx *ctx);
libptouch_err_t libptouch_last_error(const libptouch_ctx *ctx); libptouch_err_t libptouch_last_error(const libptouch_ctx *ctx);
@@ -76,7 +93,7 @@ typedef struct {
typedef struct { typedef struct {
uint8_t media_width_code; /**< status[10] */ uint8_t media_width_code; /**< status[10] */
uint8_t media_kind_code; /**< status[11] */ uint8_t media_kind_code; /**< status[11] */
double print_dpi; /**< 印字幅方向 DPI現状 180 or 360 */ double print_dpi; /**< 印字幅方向 DPI系統既定または設定ファイル上書き */
double feed_dpi; /**< 送り方向 DPIESC i d の基準) */ double feed_dpi; /**< 送り方向 DPIESC i d の基準) */
double tape_width_mm; /**< 装着テープ幅mm。例: 3.5, 6, 9, 12, 18, 24, 36 */ double tape_width_mm; /**< 装着テープ幅mm。例: 3.5, 6, 9, 12, 18, 24, 36 */
uint16_t printable_dots; /**< 現在テープで印字可能な幅(ドット) */ uint16_t printable_dots; /**< 現在テープで印字可能な幅(ドット) */
@@ -84,6 +101,8 @@ typedef struct {
uint16_t right_margin_dots; /**< 右余白(ドット) */ uint16_t right_margin_dots; /**< 右余白(ドット) */
uint16_t min_feed_dots; /**< 仕様上の最小送り量(ドット)。現在は 14 */ uint16_t min_feed_dots; /**< 仕様上の最小送り量(ドット)。現在は 14 */
double min_feed_mm; /**< 最小送り量mm */ double min_feed_mm; /**< 最小送り量mm */
/** @ref libptouch_printer_family_t系統不明時は @ref LIBPTOUCH_FAMILY_UNKNOWN */
uint32_t printer_family;
} libptouch_media_info_t; } libptouch_media_info_t;
/** /**
@@ -113,8 +132,8 @@ libptouch_err_t libptouch_trim_right_blank_columns(
/** /**
* 1 ビット packed ラスターを USB で印刷(各機種のラスター PDF 準拠)。 * 1 ビット packed ラスターを USB で印刷(各機種のラスター PDF 準拠)。
* 印字前にステータスでテープ幅を読み、印刷可能ドット内に画像を中央配置する。 * 印字前にステータスでテープ幅を読み、印刷可能ドット内に画像を中央配置する。
* width_dots は装着テープの印刷可能幅以下であること。PT-P900 系は幅 360dpi、 * width_dots は装着テープの印刷可能幅以下であること。系統は @ref libptouch_get_current_media_info
* PT-P750W / PT-P710BT は幅 180dpicv_ptp750w_710bt_jpn_raster_102.pdfのドット列を想定 * の printer_family で判別できるP900 系は主に 360dpi 相当ドット列、P700 系は 180dpi 相当)
* @param margin_mm 余白フィード量。0 のとき PDF の最小 1mm14 ドット)相当を送る。 * @param margin_mm 余白フィード量。0 のとき PDF の最小 1mm14 ドット)相当を送る。
* 印刷時は内部でドット列を転置する(テープ幅方向とバッファの縦横の対応)。 * 印刷時は内部でドット列を転置する(テープ幅方向とバッファの縦横の対応)。
* @param data 1 行あたり width_dots ビットを ceil(width_dots/8) バイトで並べた連続領域 * @param data 1 行あたり width_dots ビットを ceil(width_dots/8) バイトで並べた連続領域

View File

@@ -0,0 +1,14 @@
= P-Toouch Raster コマンド リファレンスメモ
== 印字データ
印刷データは大きく分けて、初期化コマンド、制御コード、ラスターデータ、印字指令から構成される。
ジョブが複数ページからなる場合には、制御コード~ラスターデータを繰り返します。
=== 初期化コマンド
印刷開始時に一度送信
1. 無効指令: NULL(0x00) × 200バイト
2. 初期化: ESC @ (0x1B 0x40)

View File

@@ -1,14 +1,18 @@
PATH PATH
remote: . remote: .
specs: specs:
libptouch (1.0.0) libptouch (1.0.1)
barby
ffi (~> 1.15) ffi (~> 1.15)
rexml rexml
rqrcode
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
ast (2.4.3) ast (2.4.3)
barby (0.7.0)
chunky_png (1.4.0)
ffi (1.17.4) ffi (1.17.4)
ffi (1.17.4-aarch64-linux-gnu) ffi (1.17.4-aarch64-linux-gnu)
ffi (1.17.4-aarch64-linux-musl) ffi (1.17.4-aarch64-linux-musl)
@@ -32,6 +36,10 @@ GEM
rainbow (3.1.1) rainbow (3.1.1)
regexp_parser (2.12.0) regexp_parser (2.12.0)
rexml (3.4.4) rexml (3.4.4)
rqrcode (3.2.0)
chunky_png (~> 1.0)
rqrcode_core (~> 2.0)
rqrcode_core (2.1.0)
rubocop (1.86.1) rubocop (1.86.1)
json (~> 2.3) json (~> 2.3)
language_server-protocol (~> 3.17.0.2) language_server-protocol (~> 3.17.0.2)
@@ -70,6 +78,8 @@ DEPENDENCIES
CHECKSUMS CHECKSUMS
ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
barby (0.7.0) sha256=8dbc7c0c320e596135d97929c0df77f969e9f9c955a157cf6749c05b44dae213
chunky_png (1.4.0) sha256=89d5b31b55c0cf4da3cf89a2b4ebc3178d8abe8cbaf116a1dba95668502fdcfe
ffi (1.17.4) sha256=bcd1642e06f0d16fc9e09ac6d49c3a7298b9789bcb58127302f934e437d60acf ffi (1.17.4) sha256=bcd1642e06f0d16fc9e09ac6d49c3a7298b9789bcb58127302f934e437d60acf
ffi (1.17.4-aarch64-linux-gnu) sha256=b208f06f91ffd8f5e1193da3cae3d2ccfc27fc36fba577baf698d26d91c080df ffi (1.17.4-aarch64-linux-gnu) sha256=b208f06f91ffd8f5e1193da3cae3d2ccfc27fc36fba577baf698d26d91c080df
ffi (1.17.4-aarch64-linux-musl) sha256=9286b7a615f2676245283aef0a0a3b475ae3aae2bb5448baace630bb77b91f39 ffi (1.17.4-aarch64-linux-musl) sha256=9286b7a615f2676245283aef0a0a3b475ae3aae2bb5448baace630bb77b91f39
@@ -83,7 +93,7 @@ CHECKSUMS
ffi (1.17.4-x86_64-linux-musl) sha256=3fdf9888483de005f8ef8d1cf2d3b20d86626af206cbf780f6a6a12439a9c49e ffi (1.17.4-x86_64-linux-musl) sha256=3fdf9888483de005f8ef8d1cf2d3b20d86626af206cbf780f6a6a12439a9c49e
json (2.19.3) sha256=289b0bb53052a1fa8c34ab33cc750b659ba14a5c45f3fcf4b18762dc67c78646 json (2.19.3) sha256=289b0bb53052a1fa8c34ab33cc750b659ba14a5c45f3fcf4b18762dc67c78646
language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc
libptouch (1.0.0) libptouch (1.0.1)
lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
parallel (2.0.1) sha256=337782d3e39f4121e67563bf91dd8ece67f48923d90698614773a0ec9a5b2c7d parallel (2.0.1) sha256=337782d3e39f4121e67563bf91dd8ece67f48923d90698614773a0ec9a5b2c7d
parser (3.3.11.1) sha256=d17ace7aabe3e72c3cc94043714be27cc6f852f104d81aa284c2281aecc65d54 parser (3.3.11.1) sha256=d17ace7aabe3e72c3cc94043714be27cc6f852f104d81aa284c2281aecc65d54
@@ -92,6 +102,8 @@ CHECKSUMS
rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb
rexml (3.4.4) sha256=19e0a2c3425dfbf2d4fc1189747bdb2f849b6c5e74180401b15734bc97b5d142 rexml (3.4.4) sha256=19e0a2c3425dfbf2d4fc1189747bdb2f849b6c5e74180401b15734bc97b5d142
rqrcode (3.2.0) sha256=64c1494ca6bb67d731330f38b50e3fd09eeab4f5dcd04b608e21218d1d0b9542
rqrcode_core (2.1.0) sha256=f303b85df89c1b8fc5ee8dc19808c9dc4330e6329b660d99d4a8cbb36ca13051
rubocop (1.86.1) sha256=44415f3f01d01a21e01132248d2fd0867572475b566ca188a0a42133a08d4531 rubocop (1.86.1) sha256=44415f3f01d01a21e01132248d2fd0867572475b566ca188a0a42133a08d4531
rubocop-ast (1.49.1) sha256=4412f3ee70f6fe4546cc489548e0f6fcf76cafcfa80fa03af67098ffed755035 rubocop-ast (1.49.1) sha256=4412f3ee70f6fe4546cc489548e0f6fcf76cafcfa80fa03af67098ffed755035
ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33

View File

@@ -37,6 +37,7 @@ SVG は現在装着テープの印字可能幅に合わせて自動拡大・縮
オプションは C 側に合わせ、`**-p` / `--pid`** で USB 製品 ID16 進可)を指定できます。省略時は PT-P900W`Libptouch::USB_PID_PTP900W` = `0x2085`)。例: PT-P750W `0x2062`、PT-P710BT `0x20af``libptouch.h` / `Libptouch` 定数と同じ)。 オプションは C 側に合わせ、`**-p` / `--pid`** で USB 製品 ID16 進可)を指定できます。省略時は PT-P900W`Libptouch::USB_PID_PTP900W` = `0x2085`)。例: PT-P750W `0x2062`、PT-P710BT `0x20af``libptouch.h` / `Libptouch` 定数と同じ)。
また、`--template`SVGと `--data`JSON/YAMLを使うと `data-field` 属性をキーにした差込印刷が可能です。 また、`--template`SVGと `--data`JSON/YAMLを使うと `data-field` 属性をキーにした差込印刷が可能です。
`data-kb-placeholder="qr"` / `data-kb-placeholder="barcode"` を付けた SVG 要素(`x/y/width/height` 必須)には、対応する `data-field` 値から QR / Code128 バーコードを生成して差し込みできます。
`--trim-right[=DOTS]` を付けると、libptouch 側の共通処理でラベル右側の空白ドット列を削減します。`DOTS` 省略時は左余白ドット数を使い、取得失敗時は `0` にフォールバックします。 `--trim-right[=DOTS]` を付けると、libptouch 側の共通処理でラベル右側の空白ドット列を削減します。`DOTS` 省略時は左余白ドット数を使い、取得失敗時は `0` にフォールバックします。
開発ツリーからそのまま試す例: 開発ツリーからそのまま試す例:

View File

@@ -27,4 +27,9 @@ module Libptouch
STATUS_LENGTH = 32 STATUS_LENGTH = 32
PNG_DEFAULT_THRESHOLD = 128 PNG_DEFAULT_THRESHOLD = 128
# libptouch_printer_family_tC API と同じ値)
FAMILY_UNKNOWN = 0
FAMILY_P700 = 1
FAMILY_P900 = 2
end end

View File

@@ -39,7 +39,8 @@ module Libptouch
:left_margin_dots, :uint16, :left_margin_dots, :uint16,
:right_margin_dots, :uint16, :right_margin_dots, :uint16,
:min_feed_dots, :uint16, :min_feed_dots, :uint16,
:min_feed_mm, :double :min_feed_mm, :double,
:printer_family, :uint32
end end
class PngOptions < FFI::Struct class PngOptions < FFI::Struct
@@ -51,6 +52,7 @@ module Libptouch
end end
attach_function :libptouch_create, [], :pointer attach_function :libptouch_create, [], :pointer
attach_function :libptouch_printer_family_label, [:uint32], :string
attach_function :libptouch_destroy, [:pointer], :void attach_function :libptouch_destroy, [:pointer], :void
attach_function :libptouch_strerror, [:pointer], :string attach_function :libptouch_strerror, [:pointer], :string
attach_function :libptouch_last_error, [:pointer], :int attach_function :libptouch_last_error, [:pointer], :int

View File

@@ -2,9 +2,13 @@
require "json" require "json"
require "optparse" require "optparse"
require "rqrcode"
require "rexml/document" require "rexml/document"
require "tempfile" require "tempfile"
require "yaml" require "yaml"
require "barby"
require "barby/barcode/code_128"
require "barby/outputter/svg_outputter"
require "libptouch" require "libptouch"
@@ -289,12 +293,155 @@ module Libptouch
replace_text_element_content(el, data[key].to_s) replace_text_element_content(el, data[key].to_s)
end end
replace_code_placeholders(doc, data)
out = +"" out = +""
formatter = REXML::Formatters::Default.new formatter = REXML::Formatters::Default.new
formatter.write(doc, out) formatter.write(doc, out)
out out
end end
def replace_code_placeholders(doc, data)
doc.elements.each("//*[@data-field][@data-kb-placeholder]") do |el|
key = el.attributes["data-field"].to_s
next unless data.key?(key)
kind = el.attributes["data-kb-placeholder"].to_s.downcase
next unless %w[qr barcode].include?(kind)
x, y, width, height = read_box(el)
next if width <= 0 || height <= 0
raw_value = data[key].to_s
next if raw_value.empty?
replacement = build_code_svg_element(
kind: kind,
value: raw_value,
x: x,
y: y,
width: width,
height: height
)
el.parent&.insert_after(el, replacement)
el.parent&.delete(el)
end
end
def read_box(el)
x = el.attributes["x"].to_s.to_f
y = el.attributes["y"].to_s.to_f
width = el.attributes["width"].to_s.to_f
height = el.attributes["height"].to_s.to_f
[x, y, width, height]
end
def build_code_svg_element(kind:, value:, x:, y:, width:, height:)
svg_fragment =
if kind == "qr"
render_qr_svg(value)
else
render_barcode_svg(value)
end
fragment_doc = REXML::Document.new(strip_xml_declaration(svg_fragment))
svg_root = fragment_doc.root
svg_root = wrap_non_svg_root(svg_root) unless svg_root&.name == "svg"
if kind == "qr"
apply_qr_svg_box(svg_root, x: x, y: y, width: width, height: height)
else
apply_barcode_svg_box(svg_root, x: x, y: y, height: height)
end
svg_root
end
def apply_qr_svg_box(svg_root, x:, y:, width:, height:)
nat_w, nat_h = svg_natural_dimensions(svg_root)
if nat_w <= 0 || nat_h <= 0
nat_w = parse_length_attr(svg_root.attributes["width"])
nat_h = parse_length_attr(svg_root.attributes["height"])
end
raise ArgumentError, "QR SVG has no usable dimensions" if nat_w <= 0 || nat_h <= 0
svg_root.attributes["viewBox"] = "0 0 #{nat_w} #{nat_h}"
svg_root.attributes["x"] = x.to_s
svg_root.attributes["y"] = y.to_s
svg_root.attributes["width"] = width.to_s
svg_root.attributes["height"] = height.to_s
svg_root.attributes["preserveAspectRatio"] = "xMidYMid meet"
end
def apply_barcode_svg_box(svg_root, x:, y:, height:)
nat_w, nat_h = svg_natural_dimensions(svg_root)
if nat_w <= 0 || nat_h <= 0
nat_w = parse_length_attr(svg_root.attributes["width"])
nat_h = parse_length_attr(svg_root.attributes["height"])
end
raise ArgumentError, "barcode SVG has no usable dimensions" if nat_w <= 0 || nat_h <= 0
scale = height / nat_h
out_w = nat_w * scale
out_h = nat_h * scale
svg_root.attributes["viewBox"] = "0 0 #{nat_w} #{nat_h}"
svg_root.attributes["x"] = x.to_s
svg_root.attributes["y"] = y.to_s
svg_root.attributes["width"] = out_w.to_s
svg_root.attributes["height"] = out_h.to_s
svg_root.attributes["preserveAspectRatio"] = "xMidYMid meet"
end
def strip_xml_declaration(s)
s.to_s.sub(/\A<\?xml[^>]*\?>\s*/m, "")
end
def svg_natural_dimensions(svg_root)
vb = svg_root.attributes["viewBox"].to_s.strip
if (m = /\A\s*([-\d.eE+]+)\s+([-\d.eE+]+)\s+([-\d.eE+]+)\s+([-\d.eE+]+)\s*\z/.match(vb))
return [m[3].to_f, m[4].to_f]
end
[parse_length_attr(svg_root.attributes["width"]),
parse_length_attr(svg_root.attributes["height"])]
end
def parse_length_attr(str)
s = str.to_s.strip
return 0.0 if s.empty?
s = s.delete_suffix("px").strip
Float(s)
rescue ArgumentError
0.0
end
def render_qr_svg(value)
qrcode = RQRCode::QRCode.new(value)
qrcode.as_svg(
standalone: true,
use_path: true,
module_size: 1,
offset: 0,
color: "000",
shape_rendering: "crispEdges"
)
end
def render_barcode_svg(value)
barcode = Barby::Code128B.new(value)
Barby::SvgOutputter.new(barcode).to_svg(
xdim: 2,
height: 64,
margin: 0
)
end
def wrap_non_svg_root(root)
svg = REXML::Element.new("svg")
svg.add_namespace("http://www.w3.org/2000/svg")
svg.add_element(root)
svg
end
def replace_text_element_content(text_element, value) def replace_text_element_content(text_element, value)
# Remove all child nodes first so mixed content (<tspan>, text nodes, etc.) # Remove all child nodes first so mixed content (<tspan>, text nodes, etc.)
# gets replaced consistently by merge data. # gets replaced consistently by merge data.

View File

@@ -151,6 +151,7 @@ module Libptouch
def current_media_info def current_media_info
info = Binding::MediaInfo.new info = Binding::MediaInfo.new
raise_on_error(Binding.libptouch_get_current_media_info(@native, info.pointer)) raise_on_error(Binding.libptouch_get_current_media_info(@native, info.pointer))
fam = info[:printer_family]
{ {
media_width_code: info[:media_width_code], media_width_code: info[:media_width_code],
media_kind_code: info[:media_kind_code], media_kind_code: info[:media_kind_code],
@@ -161,7 +162,9 @@ module Libptouch
left_margin_dots: info[:left_margin_dots], left_margin_dots: info[:left_margin_dots],
right_margin_dots: info[:right_margin_dots], right_margin_dots: info[:right_margin_dots],
min_feed_dots: info[:min_feed_dots], min_feed_dots: info[:min_feed_dots],
min_feed_mm: info[:min_feed_mm] min_feed_mm: info[:min_feed_mm],
printer_family: fam,
printer_family_label: Binding.libptouch_printer_family_label(fam)
} }
end end
end end

View File

@@ -29,5 +29,7 @@ Gem::Specification.new do |spec|
spec.require_paths = ["lib"] spec.require_paths = ["lib"]
spec.add_dependency "ffi", "~> 1.15" spec.add_dependency "ffi", "~> 1.15"
spec.add_dependency "barby"
spec.add_dependency "rqrcode"
spec.add_dependency "rexml" spec.add_dependency "rexml"
end end

View File

@@ -13,4 +13,5 @@
```bash ```bash
ruby -I ruby/lib ruby/exe/ptouch-label -n --template samples/merge_template.svg --data samples/merge_data.yml ruby -I ruby/lib ruby/exe/ptouch-label -n --template samples/merge_template.svg --data samples/merge_data.yml
ruby -I ruby/lib ruby/exe/ptouch-label -n --template samples/merge_template.svg --data samples/merge_data.json ruby -I ruby/lib ruby/exe/ptouch-label -n --template samples/merge_template.svg --data samples/merge_data.json
ruby -I ruby/lib ruby/exe/ptouch-label -n --template samples/code.svg --data samples/code.yml
``` ```

7
samples/code.svg Normal file
View File

@@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 36" width="100mm" height="36mm">
<rect x="0.25" y="0.25" width="99.75" height="35.75" fill="#ffffff" stroke="#000000" stroke-width="0.25"/>
<text x="2" y="7" font-size="4.5" fill="#000000" font-family="sans-serif" data-field="itemName">サンプル備品</text>
<text x="2" y="14" font-size="3.2" fill="#000000" font-family="sans-serif" data-field="model">KB-001</text>
<rect x="78" y="3" width="18.25" height="18.25" fill="none" stroke="#000000" stroke-width="0.25" stroke-dasharray="1 0.8" data-field="qrText" data-kb-placeholder="qr"/>
<rect x="8" y="24" width="72.25" height="8.25" fill="none" stroke="#000000" stroke-width="0.25" stroke-dasharray="1 0.6" data-field="barcodeText" data-kb-placeholder="barcode"/>
</svg>

After

Width:  |  Height:  |  Size: 781 B

4
samples/code.yml Normal file
View File

@@ -0,0 +1,4 @@
itemName: "サンプル備品 001"
model: "KB-002"
qrText: "https://wwww.artif.org"
barcodeText: "KB001"

View File

@@ -124,6 +124,10 @@ static void verbose_print_pre_print_info(libptouch_ctx *ctx,
printf("printable dots: %u\n", (unsigned)mi.printable_dots); printf("printable dots: %u\n", (unsigned)mi.printable_dots);
printf("left/right margins: %u/%u dots\n", printf("left/right margins: %u/%u dots\n",
(unsigned)mi.left_margin_dots, (unsigned)mi.right_margin_dots); (unsigned)mi.left_margin_dots, (unsigned)mi.right_margin_dots);
printf("printer family: %s (%u)\n",
libptouch_printer_family_label(
(libptouch_printer_family_t)mi.printer_family),
(unsigned)mi.printer_family);
printf("print/feed dpi: %.1f/%.1f\n", mi.print_dpi, mi.feed_dpi); printf("print/feed dpi: %.1f/%.1f\n", mi.print_dpi, mi.feed_dpi);
} else { } else {
printf("media info: unavailable (%s)\n", libptouch_strerror(ctx)); printf("media info: unavailable (%s)\n", libptouch_strerror(ctx));

View File

@@ -6,6 +6,7 @@
*/ */
#include "libptouch_internal.h" #include "libptouch_internal.h"
#include "libptouch_family_config.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -33,6 +34,8 @@ void ptouch_set_error_usb(libptouch_ctx *ctx, int libusb_err, const char *what)
libptouch_ctx *libptouch_create(void) libptouch_ctx *libptouch_create(void)
{ {
ptouch_family_config_init_once();
libptouch_ctx *ctx = calloc(1, sizeof(*ctx)); libptouch_ctx *ctx = calloc(1, sizeof(*ctx));
if (!ctx) if (!ctx)
return NULL; return NULL;

View File

@@ -0,0 +1,302 @@
/*
* libptouch — optional JSON overrides for P700/P900 family parameters
*
* 検索順: 環境変数 LIBPTOUCH_CONFIG、カレントの printer_families.json、
* config/printer_families.jsonリポジトリ配置用
*/
#include "libptouch_family_config.h"
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
enum {
OV_PRINT_DPI = 1 << 0,
OV_MARGIN_FEED_DPI = 1 << 1,
OV_MARGIN_MAX = 1 << 2,
OV_ESC_IA = 1 << 3,
};
typedef struct {
unsigned mask;
double print_dpi;
double margin_feed_dpi;
unsigned margin_feed_max_dots;
int send_esc_ia;
} family_override_t;
static family_override_t g_p700;
static family_override_t g_p900;
static int g_loaded;
static const char *skip_ws(const char *p)
{
while (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r')
p++;
return p;
}
static int read_file_all(const char *path, char **out, size_t *out_len)
{
FILE *fp = fopen(path, "rb");
if (!fp)
return -1;
if (fseek(fp, 0, SEEK_END) != 0) {
fclose(fp);
return -1;
}
long sz = ftell(fp);
if (sz < 0 || sz > 65536) {
fclose(fp);
return -1;
}
rewind(fp);
char *buf = (char *)malloc((size_t)sz + 1u);
if (!buf) {
fclose(fp);
return -1;
}
size_t n = fread(buf, 1, (size_t)sz, fp);
fclose(fp);
buf[n] = '\0';
*out = buf;
*out_len = n;
return 0;
}
static const char *find_quoted_key(const char *json, const char *key)
{
char pat[48];
snprintf(pat, sizeof(pat), "\"%s\"", key);
return strstr(json, pat);
}
static int extract_object_after_key(const char *json, const char *key,
char *out, size_t out_sz)
{
const char *p = find_quoted_key(json, key);
if (!p)
return -1;
p += strlen(key) + 2u;
p = skip_ws(p);
if (*p != ':')
return -1;
p++;
p = skip_ws(p);
if (*p != '{')
return -1;
int depth = 0;
const char *start = p;
for (; *p; p++) {
if (*p == '{')
depth++;
else if (*p == '}') {
depth--;
if (depth == 0) {
size_t n = (size_t)(p - start + 1u);
if (n >= out_sz)
return -1;
memcpy(out, start, n);
out[n] = '\0';
return 0;
}
}
}
return -1;
}
static int parse_bool_val(const char *s, int *out)
{
s = skip_ws(s);
if (strncmp(s, "true", 4) == 0) {
*out = 1;
return 0;
}
if (strncmp(s, "false", 5) == 0) {
*out = 0;
return 0;
}
return -1;
}
static int parse_field_double(const char *obj, const char *key, double *dst)
{
const char *p = find_quoted_key(obj, key);
if (!p)
return -1;
p += strlen(key) + 2u;
p = skip_ws(p);
if (*p != ':')
return -1;
p++;
p = skip_ws(p);
char *end = NULL;
double v = strtod(p, &end);
if (end == p)
return -1;
*dst = v;
return 0;
}
static int parse_field_uint(const char *obj, const char *key, unsigned *dst)
{
const char *p = find_quoted_key(obj, key);
if (!p)
return -1;
p += strlen(key) + 2u;
p = skip_ws(p);
if (*p != ':')
return -1;
p++;
p = skip_ws(p);
char *end = NULL;
unsigned long v = strtoul(p, &end, 10);
if (end == p)
return -1;
*dst = (unsigned)v;
return 0;
}
static int parse_field_bool(const char *obj, const char *key, int *dst)
{
const char *p = find_quoted_key(obj, key);
if (!p)
return -1;
p += strlen(key) + 2u;
p = skip_ws(p);
if (*p != ':')
return -1;
p++;
p = skip_ws(p);
return parse_bool_val(p, dst);
}
static void apply_family_block(const char *block, family_override_t *o)
{
double d;
unsigned u;
int b;
if (parse_field_double(block, "print_dpi", &d) == 0) {
o->print_dpi = d;
o->mask |= OV_PRINT_DPI;
}
if (parse_field_double(block, "margin_feed_dpi", &d) == 0) {
o->margin_feed_dpi = d;
o->mask |= OV_MARGIN_FEED_DPI;
}
if (parse_field_uint(block, "margin_feed_max_dots", &u) == 0) {
o->margin_feed_max_dots = u;
o->mask |= OV_MARGIN_MAX;
}
if (parse_field_bool(block, "send_esc_ia_cut_each", &b) == 0) {
o->send_esc_ia = b;
o->mask |= OV_ESC_IA;
}
}
static void parse_config_json(const char *json)
{
char inner[4096];
const char *families = json;
if (extract_object_after_key(json, "families", inner, sizeof(inner)) == 0)
families = inner;
char block[2048];
if (extract_object_after_key(families, "p700", block, sizeof(block)) == 0)
apply_family_block(block, &g_p700);
if (extract_object_after_key(families, "p900", block, sizeof(block)) == 0)
apply_family_block(block, &g_p900);
}
static void try_load_path(const char *path)
{
char *buf = NULL;
size_t len = 0;
if (read_file_all(path, &buf, &len) != 0)
return;
parse_config_json(buf);
free(buf);
}
void ptouch_family_config_init_once(void)
{
if (g_loaded)
return;
g_loaded = 1;
memset(&g_p700, 0, sizeof(g_p700));
memset(&g_p900, 0, sizeof(g_p900));
const char *env = getenv("LIBPTOUCH_CONFIG");
if (env && env[0])
try_load_path(env);
try_load_path("printer_families.json");
try_load_path("config/printer_families.json");
}
double ptouch_effective_print_dpi(const ptouch_printer_profile_t *prof)
{
if (!prof)
return 0.0;
if (prof->family == LIBPTOUCH_FAMILY_P700 &&
(g_p700.mask & OV_PRINT_DPI))
return g_p700.print_dpi;
if (prof->family == LIBPTOUCH_FAMILY_P900 &&
(g_p900.mask & OV_PRINT_DPI))
return g_p900.print_dpi;
return prof->print_dpi;
}
double ptouch_effective_margin_feed_dpi(const ptouch_printer_profile_t *prof)
{
if (!prof)
return 0.0;
if (prof->family == LIBPTOUCH_FAMILY_P700 &&
(g_p700.mask & OV_MARGIN_FEED_DPI))
return g_p700.margin_feed_dpi;
if (prof->family == LIBPTOUCH_FAMILY_P900 &&
(g_p900.mask & OV_MARGIN_FEED_DPI))
return g_p900.margin_feed_dpi;
return prof->margin_feed_dpi;
}
unsigned ptouch_effective_margin_feed_max_dots(const ptouch_printer_profile_t *prof)
{
if (!prof)
return 0u;
if (prof->family == LIBPTOUCH_FAMILY_P700 &&
(g_p700.mask & OV_MARGIN_MAX))
return g_p700.margin_feed_max_dots;
if (prof->family == LIBPTOUCH_FAMILY_P900 &&
(g_p900.mask & OV_MARGIN_MAX))
return g_p900.margin_feed_max_dots;
return prof->margin_feed_max_dots;
}
int ptouch_effective_send_esc_ia_cut_each(const ptouch_printer_profile_t *prof)
{
if (!prof)
return 0;
if (prof->family == LIBPTOUCH_FAMILY_P700 &&
(g_p700.mask & OV_ESC_IA))
return g_p700.send_esc_ia;
if (prof->family == LIBPTOUCH_FAMILY_P900 &&
(g_p900.mask & OV_ESC_IA))
return g_p900.send_esc_ia;
return (int)prof->send_esc_ia_cut_each;
}
const char *libptouch_printer_family_label(libptouch_printer_family_t family)
{
switch (family) {
case LIBPTOUCH_FAMILY_P700:
return "p700";
case LIBPTOUCH_FAMILY_P900:
return "p900";
default:
return "unknown";
}
}

View File

@@ -0,0 +1,19 @@
/*
* libptouch — printer family overrides (JSON config, optional)
*/
#ifndef LIBPTOUCH_FAMILY_CONFIG_H
#define LIBPTOUCH_FAMILY_CONFIG_H
#include "libptouch_layout.h"
#include <stddef.h>
void ptouch_family_config_init_once(void);
double ptouch_effective_print_dpi(const ptouch_printer_profile_t *prof);
double ptouch_effective_margin_feed_dpi(const ptouch_printer_profile_t *prof);
unsigned ptouch_effective_margin_feed_max_dots(const ptouch_printer_profile_t *prof);
int ptouch_effective_send_esc_ia_cut_each(const ptouch_printer_profile_t *prof);
#endif /* LIBPTOUCH_FAMILY_CONFIG_H */

View File

@@ -61,9 +61,12 @@ static const ptouch_printer_profile_t ptouch_layout_profiles[] = {
.usb_pids = pids_128pin, .usb_pids = pids_128pin,
.model_codes = models_128pin, .model_codes = models_128pin,
.is_default = 0, .is_default = 0,
.family = LIBPTOUCH_FAMILY_P700,
.head_width_dots = 128u, .head_width_dots = 128u,
.print_dpi = 180.0,
.margin_feed_dpi = 180.0, .margin_feed_dpi = 180.0,
.margin_feed_max_dots = 900u, .margin_feed_max_dots = 900u,
.send_esc_ia_cut_each = 0u,
.tze = layout_tze_128, .tze = layout_tze_128,
.tze_count = sizeof(layout_tze_128) / sizeof(layout_tze_128[0]), .tze_count = sizeof(layout_tze_128) / sizeof(layout_tze_128[0]),
.hs = layout_hs_128, .hs = layout_hs_128,
@@ -74,9 +77,12 @@ static const ptouch_printer_profile_t ptouch_layout_profiles[] = {
.usb_pids = NULL, .usb_pids = NULL,
.model_codes = NULL, .model_codes = NULL,
.is_default = 1, .is_default = 1,
.family = LIBPTOUCH_FAMILY_P900,
.head_width_dots = 560u, .head_width_dots = 560u,
.print_dpi = 360.0,
.margin_feed_dpi = 360.0, .margin_feed_dpi = 360.0,
.margin_feed_max_dots = 1800u, .margin_feed_max_dots = 1800u,
.send_esc_ia_cut_each = 1u,
.tze = layout_tze_560, .tze = layout_tze_560,
.tze_count = sizeof(layout_tze_560) / sizeof(layout_tze_560[0]), .tze_count = sizeof(layout_tze_560) / sizeof(layout_tze_560[0]),
.hs = layout_hs_560, .hs = layout_hs_560,

View File

@@ -29,9 +29,13 @@ typedef struct ptouch_printer_profile {
const uint16_t *usb_pids; /* 0-terminated; NULL = do not match on PID */ const uint16_t *usb_pids; /* 0-terminated; NULL = do not match on PID */
const uint8_t *model_codes; /* 0-terminated; NULL = do not match on status[4] */ const uint8_t *model_codes; /* 0-terminated; NULL = do not match on status[4] */
int is_default; /* 1 = fallback when no other profile matches */ int is_default; /* 1 = fallback when no other profile matches */
libptouch_printer_family_t family; /**< P700 / P900 系統(コマンド差の条件分岐の基準) */
unsigned head_width_dots; /* 128 or 560; full raster width for pack/GF payload */ unsigned head_width_dots; /* 128 or 560; full raster width for pack/GF payload */
double print_dpi; /* 印字幅方向 DPIPDF・ラスター解像度の目安 */
double margin_feed_dpi; /* ESC i d feed dots per inch (PDF) */ double margin_feed_dpi; /* ESC i d feed dots per inch (PDF) */
unsigned margin_feed_max_dots; unsigned margin_feed_max_dots;
/** ESC i A各 n 枚でカットを送るかP700 系では送らない) */
unsigned char send_esc_ia_cut_each;
const ptouch_layout_row_t *tze; const ptouch_layout_row_t *tze;
size_t tze_count; size_t tze_count;
const ptouch_layout_row_t *hs; const ptouch_layout_row_t *hs;

View File

@@ -6,6 +6,7 @@
*/ */
#include "libptouch_internal.h" #include "libptouch_internal.h"
#include "libptouch_family_config.h"
#include "libptouch_layout.h" #include "libptouch_layout.h"
#include <string.h> #include <string.h>
@@ -34,15 +35,6 @@ static double tape_width_mm_from_code(uint8_t media_w)
} }
} }
static double print_dpi_from_profile(const ptouch_printer_profile_t *prof)
{
if (!prof)
return 0.0;
if (prof->head_width_dots <= 128u)
return 180.0;
return 360.0;
}
libptouch_err_t libptouch_get_current_media_info(libptouch_ctx *ctx, libptouch_err_t libptouch_get_current_media_info(libptouch_ctx *ctx,
libptouch_media_info_t *out_info) libptouch_media_info_t *out_info)
{ {
@@ -53,6 +45,7 @@ libptouch_err_t libptouch_get_current_media_info(libptouch_ctx *ctx,
} }
memset(out_info, 0, sizeof(*out_info)); memset(out_info, 0, sizeof(*out_info));
ptouch_family_config_init_once();
uint8_t st[LIBPTOUCH_STATUS_LENGTH]; uint8_t st[LIBPTOUCH_STATUS_LENGTH];
libptouch_err_t v = libptouch_get_status(ctx, st); libptouch_err_t v = libptouch_get_status(ctx, st);
@@ -85,15 +78,16 @@ libptouch_err_t libptouch_get_current_media_info(libptouch_ctx *ctx,
out_info->media_width_code = st[10]; out_info->media_width_code = st[10];
out_info->media_kind_code = st[11]; out_info->media_kind_code = st[11];
out_info->print_dpi = print_dpi_from_profile(prof); out_info->print_dpi = ptouch_effective_print_dpi(prof);
out_info->feed_dpi = prof->margin_feed_dpi; out_info->feed_dpi = ptouch_effective_margin_feed_dpi(prof);
out_info->tape_width_mm = tape_mm; out_info->tape_width_mm = tape_mm;
out_info->printable_dots = print_dots; out_info->printable_dots = print_dots;
out_info->left_margin_dots = left_dots; out_info->left_margin_dots = left_dots;
out_info->right_margin_dots = right_dots; out_info->right_margin_dots = right_dots;
out_info->min_feed_dots = 14u; out_info->min_feed_dots = 14u;
out_info->min_feed_mm = out_info->min_feed_mm = ((double)out_info->min_feed_dots * 25.4) /
((double)out_info->min_feed_dots * 25.4) / prof->margin_feed_dpi; ptouch_effective_margin_feed_dpi(prof);
out_info->printer_family = (uint32_t)prof->family;
ptouch_set_error(ctx, LIBPTOUCH_OK, ""); ptouch_set_error(ctx, LIBPTOUCH_OK, "");
return LIBPTOUCH_OK; return LIBPTOUCH_OK;

View File

@@ -6,6 +6,7 @@
*/ */
#include "libptouch_internal.h" #include "libptouch_internal.h"
#include "libptouch_family_config.h"
#include "libptouch_layout.h" #include "libptouch_layout.h"
#include "libptouch_protocol.h" #include "libptouch_protocol.h"
@@ -76,6 +77,8 @@ libptouch_err_t libptouch_print_raster(libptouch_ctx *ctx,
return LIBPTOUCH_ERR_IO; return LIBPTOUCH_ERR_IO;
} }
ptouch_family_config_init_once();
uint8_t st[LIBPTOUCH_STATUS_LENGTH]; uint8_t st[LIBPTOUCH_STATUS_LENGTH];
v = libptouch_get_status(ctx, st); v = libptouch_get_status(ctx, st);
if (v != LIBPTOUCH_OK) if (v != LIBPTOUCH_OK)
@@ -126,8 +129,9 @@ libptouch_err_t libptouch_print_raster(libptouch_ctx *ctx,
return LIBPTOUCH_ERR_ARG; return LIBPTOUCH_ERR_ARG;
} }
double margin_dpi = prof->margin_feed_dpi; double margin_dpi = ptouch_effective_margin_feed_dpi(prof);
unsigned margin_max = prof->margin_feed_max_dots; unsigned margin_max =
ptouch_effective_margin_feed_max_dots(prof);
unsigned margin_dots = 14u; unsigned margin_dots = 14u;
if (params->margin_mm > 0) { if (params->margin_mm > 0) {
margin_dots = (unsigned)((double)params->margin_mm * margin_dpi / margin_dots = (unsigned)((double)params->margin_mm * margin_dpi /
@@ -152,7 +156,7 @@ libptouch_err_t libptouch_print_raster(libptouch_ctx *ctx,
pos += sizeof(raster_mode); pos += sizeof(raster_mode);
uint8_t esc_iz[13]; uint8_t esc_iz[13];
ptouch_fill_esc_iz(esc_iz, media_kind, media_w, lines); ptouch_fill_esc_iz(esc_iz, prof, media_kind, media_w, lines);
memcpy(head + pos, esc_iz, sizeof(esc_iz)); memcpy(head + pos, esc_iz, sizeof(esc_iz));
pos += sizeof(esc_iz); pos += sizeof(esc_iz);
@@ -161,11 +165,10 @@ libptouch_err_t libptouch_print_raster(libptouch_ctx *ctx,
pos += sizeof(esc_im); pos += sizeof(esc_im);
/* /*
* ESC i A ("cut each n labels") is not supported on PT-P710BT class * ESC i A ("cut each n labels") — P700 系では送らない(通信エラーになり得る)。
* devices. Sending it can trigger a communication error (red LED blink). * 既定は系統フラグ、printer_families.json で上書き可。
* Keep it only for 560-dot family.
*/ */
if (prof->head_width_dots > 128u) { if (ptouch_effective_send_esc_ia_cut_each(prof)) {
static const uint8_t esc_ia[] = { 0x1B, 0x69, 0x41, 0x01 }; static const uint8_t esc_ia[] = { 0x1B, 0x69, 0x41, 0x01 };
memcpy(head + pos, esc_ia, sizeof(esc_ia)); memcpy(head + pos, esc_ia, sizeof(esc_ia));
pos += sizeof(esc_ia); pos += sizeof(esc_ia);
@@ -217,21 +220,6 @@ libptouch_err_t libptouch_print_raster(libptouch_ctx *ctx,
} }
free(gbuf); free(gbuf);
/*
* Some 560-dot family devices are sensitive to end-of-page sequencing.
* Send FF (0x0C) then Control-Z (0x1A) on that family to explicitly
* terminate page and final feed/cut.
*/
if (head_dots > 128u) {
static const uint8_t page_end[] = { 0x0C };
v = ptouch_bulk_send_job(ctx, page_end, sizeof(page_end),
"print page end");
if (v != LIBPTOUCH_OK) {
free(transposed);
return v;
}
}
static const uint8_t print_end[] = { 0x1A }; static const uint8_t print_end[] = { 0x1A };
v = ptouch_bulk_send_job(ctx, print_end, sizeof(print_end), "print end"); v = ptouch_bulk_send_job(ctx, print_end, sizeof(print_end), "print end");
if (v != LIBPTOUCH_OK) { if (v != LIBPTOUCH_OK) {

View File

@@ -12,9 +12,13 @@ void ptouch_fill_gf_header(uint8_t out[3], size_t line_payload_bytes)
out[2] = (uint8_t)((line_payload_bytes >> 8) & 0xFFu); out[2] = (uint8_t)((line_payload_bytes >> 8) & 0xFFu);
} }
void ptouch_fill_esc_iz(uint8_t out[13], uint8_t media_kind, uint8_t media_width, void ptouch_fill_esc_iz(uint8_t out[13], const ptouch_printer_profile_t *prof,
uint32_t raster_lines) uint8_t media_kind, uint8_t media_width, uint32_t raster_lines)
{ {
uint8_t page_byte = 0x00u;
if (prof && prof->family == LIBPTOUCH_FAMILY_P900)
page_byte = 0x02u; /* 単一ラスター = 1 ページのみ → 最終ページ */
out[0] = 0x1Bu; out[0] = 0x1Bu;
out[1] = 0x69u; out[1] = 0x69u;
out[2] = 0x7Au; out[2] = 0x7Au;
@@ -28,7 +32,7 @@ void ptouch_fill_esc_iz(uint8_t out[13], uint8_t media_kind, uint8_t media_width
out[8] = (uint8_t)((raster_lines >> 8) & 0xFFu); out[8] = (uint8_t)((raster_lines >> 8) & 0xFFu);
out[9] = (uint8_t)((raster_lines >> 16) & 0xFFu); out[9] = (uint8_t)((raster_lines >> 16) & 0xFFu);
out[10] = (uint8_t)((raster_lines >> 24) & 0xFFu); out[10] = (uint8_t)((raster_lines >> 24) & 0xFFu);
out[11] = 0x00u; /* first page */ out[11] = page_byte;
out[12] = 0x00u; /* fixed */ out[12] = 0x00u; /* fixed */
} }

View File

@@ -1,12 +1,19 @@
#ifndef LIBPTOUCH_PROTOCOL_H #ifndef LIBPTOUCH_PROTOCOL_H
#define LIBPTOUCH_PROTOCOL_H #define LIBPTOUCH_PROTOCOL_H
#include "libptouch_layout.h"
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
size_t ptouch_line_payload_bytes(unsigned head_dots); size_t ptouch_line_payload_bytes(unsigned head_dots);
void ptouch_fill_gf_header(uint8_t out[3], size_t line_payload_bytes); void ptouch_fill_gf_header(uint8_t out[3], size_t line_payload_bytes);
void ptouch_fill_esc_iz(uint8_t out[13], uint8_t media_kind, uint8_t media_width, /**
* ESC i z (13 バイト)。out[11] は prof の系統から決めるP900 の単一ページ印字では 02h、
* P700 は 00h。prof が NULL のときは 00h。
*/
void ptouch_fill_esc_iz(uint8_t out[13], const ptouch_printer_profile_t *prof,
uint8_t media_kind, uint8_t media_width,
uint32_t raster_lines); uint32_t raster_lines);
uint8_t ptouch_esc_ik_value(unsigned head_dots); uint8_t ptouch_esc_ik_value(unsigned head_dots);

View File

@@ -3,6 +3,14 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
static const ptouch_printer_profile_t prof_fixture_p700 = {
.family = LIBPTOUCH_FAMILY_P700,
};
static const ptouch_printer_profile_t prof_fixture_p900 = {
.family = LIBPTOUCH_FAMILY_P900,
};
static int expect_int(const char *name, int got, int want) static int expect_int(const char *name, int got, int want)
{ {
if (got == want) if (got == want)
@@ -30,7 +38,7 @@ int main(void)
fail |= expect_int("gf70_n2", gf[2], 0x00); fail |= expect_int("gf70_n2", gf[2], 0x00);
uint8_t iz[13]; uint8_t iz[13];
ptouch_fill_esc_iz(iz, 0x01u, 0x0Cu, 70u); ptouch_fill_esc_iz(iz, &prof_fixture_p700, 0x01u, 0x0Cu, 70u);
fail |= expect_int("iz_cmd_0", iz[0], 0x1B); fail |= expect_int("iz_cmd_0", iz[0], 0x1B);
fail |= expect_int("iz_cmd_1", iz[1], 0x69); fail |= expect_int("iz_cmd_1", iz[1], 0x69);
fail |= expect_int("iz_cmd_2", iz[2], 0x7A); fail |= expect_int("iz_cmd_2", iz[2], 0x7A);
@@ -38,9 +46,12 @@ int main(void)
fail |= expect_int("iz_media_kind_passthrough", iz[4], 0x01); fail |= expect_int("iz_media_kind_passthrough", iz[4], 0x01);
fail |= expect_int("iz_media_width", iz[5], 0x0C); fail |= expect_int("iz_media_width", iz[5], 0x0C);
fail |= expect_int("iz_lines_lsb", iz[7], 70); fail |= expect_int("iz_lines_lsb", iz[7], 70);
fail |= expect_int("iz_page_index", iz[11], 0x00); fail |= expect_int("iz_page_control_p700", iz[11], 0x00);
fail |= expect_int("iz_last_fixed", iz[12], 0x00); fail |= expect_int("iz_last_fixed", iz[12], 0x00);
ptouch_fill_esc_iz(iz, &prof_fixture_p900, 0x01u, 0x0Cu, 70u);
fail |= expect_int("iz_page_control_p900_single", iz[11], 0x02);
/* ESC i K mode byte: 128-dot vs 560-dot families */ /* ESC i K mode byte: 128-dot vs 560-dot families */
fail |= expect_int("esc_ik_128", ptouch_esc_ik_value(128u), 0x08); fail |= expect_int("esc_ik_128", ptouch_esc_ik_value(128u), 0x08);
fail |= expect_int("esc_ik_560", ptouch_esc_ik_value(560u), 0x0C); fail |= expect_int("esc_ik_560", ptouch_esc_ik_value(560u), 0x0C);