From 59bff09cd0341c723d265de5d612c0fb0f06b46b Mon Sep 17 00:00:00 2001 From: kraus Date: Mon, 8 Oct 2018 21:18:16 +0200 Subject: [PATCH] issue #712 --- csrc/u8x8.h | 1 + csrc/u8x8_d_max7219.c | 192 +++++++++++++++++++++++++++++++++--- tools/codebuild/codebuild.c | 8 ++ 3 files changed, 185 insertions(+), 16 deletions(-) diff --git a/csrc/u8x8.h b/csrc/u8x8.h index 82b3f108..281c211a 100644 --- a/csrc/u8x8.h +++ b/csrc/u8x8.h @@ -886,6 +886,7 @@ uint8_t u8x8_d_lc7981_160x160(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void * uint8_t u8x8_d_lc7981_240x128(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr); uint8_t u8x8_d_lc7981_240x64(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr); uint8_t u8x8_d_ist3020_erc19264(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr); +uint8_t u8x8_d_max7219_64x8(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr); uint8_t u8x8_d_max7219_32x8(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr); uint8_t u8x8_d_max7219_8x8(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr); diff --git a/csrc/u8x8_d_max7219.c b/csrc/u8x8_d_max7219.c index 02a4745f..bec8d01e 100644 --- a/csrc/u8x8_d_max7219.c +++ b/csrc/u8x8_d_max7219.c @@ -113,7 +113,6 @@ static uint8_t u8x8_d_max7219_generic(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int case U8X8_MSG_DISPLAY_SETUP_MEMORY: u8x8_d_helper_display_setup_memory(u8x8, &u8x8_pcf8812_96x65_display_info); break; - */ case U8X8_MSG_DISPLAY_INIT: u8x8_d_helper_display_init(u8x8); u8x8_cad_SendSequence(u8x8, u8x8_d_max7219_init_seq); @@ -124,6 +123,7 @@ static uint8_t u8x8_d_max7219_generic(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int else u8x8_cad_SendSequence(u8x8, u8x8_d_max7219_powersave1_seq); break; + */ /* not supported by MAX7219 case U8X8_MSG_DISPLAY_SET_FLIP_MODE: break; @@ -131,14 +131,11 @@ static uint8_t u8x8_d_max7219_generic(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int #ifdef U8X8_WITH_SET_CONTRAST case U8X8_MSG_DISPLAY_SET_CONTRAST: u8x8_cad_StartTransfer(u8x8); - u8x8_cad_SendCmd(u8x8, 10 ); /* brightness */ - u8x8_cad_SendArg(u8x8, (arg_int>>4) ); /* 0..15 for contrast */ - u8x8_cad_SendCmd(u8x8, 10 ); /* brightness */ - u8x8_cad_SendArg(u8x8, (arg_int>>4) ); /* 0..15 for contrast */ - u8x8_cad_SendCmd(u8x8, 10 ); /* brightness */ - u8x8_cad_SendArg(u8x8, (arg_int>>4) ); /* 0..15 for contrast */ - u8x8_cad_SendCmd(u8x8, 10 ); /* brightness */ - u8x8_cad_SendArg(u8x8, (arg_int>>4) ); /* 0..15 for contrast */ + for( i = 0; i < u8x8->display_info->tile_width; i++ ) + { + u8x8_cad_SendCmd(u8x8, 10 ); /* brightness */ + u8x8_cad_SendArg(u8x8, (arg_int>>4) ); /* 0..15 for contrast */ + } u8x8_cad_EndTransfer(u8x8); break; #endif @@ -169,6 +166,7 @@ static uint8_t u8x8_d_max7219_generic(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int return 1; } +/*==============================*/ static const u8x8_display_info_t u8x8_max7219_32x8_display_info = { @@ -196,12 +194,23 @@ static const u8x8_display_info_t u8x8_max7219_32x8_display_info = uint8_t u8x8_d_max7219_32x8(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr) { - if ( msg == U8X8_MSG_DISPLAY_SETUP_MEMORY ) - { + switch(msg) + { + case U8X8_MSG_DISPLAY_SETUP_MEMORY : u8x8_d_helper_display_setup_memory(u8x8, &u8x8_max7219_32x8_display_info); return 1; - } - return u8x8_d_max7219_generic(u8x8, msg, arg_int, arg_ptr); + case U8X8_MSG_DISPLAY_INIT: + u8x8_d_helper_display_init(u8x8); + u8x8_cad_SendSequence(u8x8, u8x8_d_max7219_init_seq); + return 1; + case U8X8_MSG_DISPLAY_SET_POWER_SAVE: + if ( arg_int == 0 ) + u8x8_cad_SendSequence(u8x8, u8x8_d_max7219_powersave0_seq); + else + u8x8_cad_SendSequence(u8x8, u8x8_d_max7219_powersave1_seq); + return 1; + } + return u8x8_d_max7219_generic(u8x8, msg, arg_int, arg_ptr); } /*==============================*/ @@ -232,13 +241,164 @@ static const u8x8_display_info_t u8x8_max7219_8x8_display_info = uint8_t u8x8_d_max7219_8x8(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr) { - if ( msg == U8X8_MSG_DISPLAY_SETUP_MEMORY ) - { + switch(msg) + { + case U8X8_MSG_DISPLAY_SETUP_MEMORY : u8x8_d_helper_display_setup_memory(u8x8, &u8x8_max7219_8x8_display_info); return 1; - } + case U8X8_MSG_DISPLAY_INIT: + u8x8_d_helper_display_init(u8x8); + u8x8_cad_SendSequence(u8x8, u8x8_d_max7219_init_seq); + return 1; + case U8X8_MSG_DISPLAY_SET_POWER_SAVE: + if ( arg_int == 0 ) + u8x8_cad_SendSequence(u8x8, u8x8_d_max7219_powersave0_seq); + else + u8x8_cad_SendSequence(u8x8, u8x8_d_max7219_powersave1_seq); + return 1; + } return u8x8_d_max7219_generic(u8x8, msg, arg_int, arg_ptr); } +/*==============================*/ + +static const uint8_t u8x8_d_max7219_8_init_seq[] = { + + U8X8_START_TRANSFER(), /* enable chip, delay is part of the transfer start */ + U8X8_CA(15, 0), /* test mode off */ + U8X8_CA(15, 0), /* test mode off */ + U8X8_CA(15, 0), /* test mode off */ + U8X8_CA(15, 0), /* test mode off */ + U8X8_CA(15, 0), /* test mode off */ + U8X8_CA(15, 0), /* test mode off */ + U8X8_CA(15, 0), /* test mode off */ + U8X8_CA(15, 0), /* test mode off */ + U8X8_END_TRANSFER(), /* disable chip */ + + U8X8_START_TRANSFER(), /* enable chip, delay is part of the transfer start */ + U8X8_CA(12, 0), /* */ + U8X8_CA(12, 0), /* */ + U8X8_CA(12, 0), /* */ + U8X8_CA(12, 0), /* */ + U8X8_CA(12, 0), /* */ + U8X8_CA(12, 0), /* */ + U8X8_CA(12, 0), /* */ + U8X8_CA(12, 0), /* */ + U8X8_END_TRANSFER(), /* disable chip */ + + U8X8_START_TRANSFER(), /* enable chip, delay is part of the transfer start */ + U8X8_CA(9, 0), /* decode mode: graphics */ + U8X8_CA(9, 0), /* decode mode: graphics */ + U8X8_CA(9, 0), /* decode mode: graphics */ + U8X8_CA(9, 0), /* decode mode: graphics */ + U8X8_CA(9, 0), /* decode mode: graphics */ + U8X8_CA(9, 0), /* decode mode: graphics */ + U8X8_CA(9, 0), /* decode mode: graphics */ + U8X8_CA(9, 0), /* decode mode: graphics */ + U8X8_END_TRANSFER(), /* disable chip */ + + U8X8_START_TRANSFER(), /* enable chip, delay is part of the transfer start */ + U8X8_CA(10, 10), /* medium high intensity */ + U8X8_CA(10, 10), /* medium high intensity */ + U8X8_CA(10, 10), /* medium high intensity */ + U8X8_CA(10, 10), /* medium high intensity */ + U8X8_CA(10, 10), /* medium high intensity */ + U8X8_CA(10, 10), /* medium high intensity */ + U8X8_CA(10, 10), /* medium high intensity */ + U8X8_CA(10, 10), /* medium high intensity */ + U8X8_END_TRANSFER(), /* disable chip */ + + U8X8_START_TRANSFER(), /* enable chip, delay is part of the transfer start */ + U8X8_CA(11, 7), /* scan limit: display all digits (assuming a 8x8 matrix) */ + U8X8_CA(11, 7), /* scan limit: display all digits (assuming a 8x8 matrix) */ + U8X8_CA(11, 7), /* scan limit: display all digits (assuming a 8x8 matrix) */ + U8X8_CA(11, 7), /* scan limit: display all digits (assuming a 8x8 matrix) */ + U8X8_CA(11, 7), /* scan limit: display all digits (assuming a 8x8 matrix) */ + U8X8_CA(11, 7), /* scan limit: display all digits (assuming a 8x8 matrix) */ + U8X8_CA(11, 7), /* scan limit: display all digits (assuming a 8x8 matrix) */ + U8X8_CA(11, 7), /* scan limit: display all digits (assuming a 8x8 matrix) */ + U8X8_END_TRANSFER(), /* disable chip */ + + + //U8X8_CA(12, 0), /* shutdown */ + + //U8X8_END_TRANSFER(), /* disable chip */ + U8X8_END() /* end of sequence */ +}; + +static const uint8_t u8x8_d_max7219_8_powersave0_seq[] = { + U8X8_START_TRANSFER(), /* enable chip, delay is part of the transfer start */ + U8X8_CA(12, 1), /* display on */ + U8X8_CA(12, 1), /* display on */ + U8X8_CA(12, 1), /* display on */ + U8X8_CA(12, 1), /* display on */ + U8X8_CA(12, 1), /* display on */ + U8X8_CA(12, 1), /* display on */ + U8X8_CA(12, 1), /* display on */ + U8X8_CA(12, 1), /* display on */ + U8X8_END_TRANSFER(), /* disable chip */ + U8X8_END() /* end of sequence */ +}; + +static const uint8_t u8x8_d_max7219_8_powersave1_seq[] = { + U8X8_START_TRANSFER(), /* enable chip, delay is part of the transfer start */ + U8X8_CA(12, 0), /* shutdown */ + U8X8_CA(12, 0), /* shutdown */ + U8X8_CA(12, 0), /* shutdown */ + U8X8_CA(12, 0), /* shutdown */ + U8X8_CA(12, 0), /* shutdown */ + U8X8_CA(12, 0), /* shutdown */ + U8X8_CA(12, 0), /* shutdown */ + U8X8_CA(12, 0), /* shutdown */ + U8X8_END_TRANSFER(), /* disable chip */ + U8X8_END() /* end of sequence */ +}; + + +static const u8x8_display_info_t u8x8_max7219_64x8_display_info = +{ + /* chip_enable_level = */ 0, + /* chip_disable_level = */ 1, + + /* post_chip_enable_wait_ns = */ 100, + /* pre_chip_disable_wait_ns = */ 100, + /* reset_pulse_width_ms = */ 100, + /* post_reset_wait_ms = */ 100, + /* sda_setup_time_ns = */ 100, + /* sck_pulse_width_ns = */ 100, + /* sck_clock_hz = */ 4000000UL, /* since Arduino 1.6.0, the SPI bus speed in Hz. Should be 1000000000/sck_pulse_width_ns */ + /* spi_mode = */ 0, /* active high, rising edge */ + /* i2c_bus_clock_100kHz = */ 4, + /* data_setup_time_ns = */ 40, + /* write_pulse_width_ns = */ 150, + /* tile_width = */ 8, + /* tile_hight = */ 1, + /* default_x_offset = */ 0, + /* flipmode_x_offset = */ 0, + /* pixel_width = */ 64, + /* pixel_height = */ 8 +}; + +uint8_t u8x8_d_max7219_64x8(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr) +{ + switch(msg) + { + case U8X8_MSG_DISPLAY_SETUP_MEMORY : + u8x8_d_helper_display_setup_memory(u8x8, &u8x8_max7219_64x8_display_info); + return 1; + case U8X8_MSG_DISPLAY_INIT: + u8x8_d_helper_display_init(u8x8); + u8x8_cad_SendSequence(u8x8, u8x8_d_max7219_8_init_seq); + return 1; + case U8X8_MSG_DISPLAY_SET_POWER_SAVE: + if ( arg_int == 0 ) + u8x8_cad_SendSequence(u8x8, u8x8_d_max7219_8_powersave0_seq); + else + u8x8_cad_SendSequence(u8x8, u8x8_d_max7219_8_powersave1_seq); + return 1; + } + return u8x8_d_max7219_generic(u8x8, msg, arg_int, arg_ptr); +} + diff --git a/tools/codebuild/codebuild.c b/tools/codebuild/codebuild.c index 85266c25..65e03e69 100644 --- a/tools/codebuild/codebuild.c +++ b/tools/codebuild/codebuild.c @@ -1200,6 +1200,14 @@ struct controller controller_list[] = { NULL } } }, + { + "max7219", 8, 1, "u8g2_ll_hvline_horizontal_right_lsb", "u8x8_cad_empty", "", COM_4WSPI, + "", /* is_generate_u8g2_class= */ 1, + { + { "64x8" }, + { NULL } + } + }, { "max7219", 4, 1, "u8g2_ll_hvline_horizontal_right_lsb", "u8x8_cad_empty", "", COM_4WSPI, "", /* is_generate_u8g2_class= */ 1,