fix : merge two tubes & four tubes

This commit is contained in:
downeyboy
2019-06-13 19:24:38 +08:00
parent ee746bcdf3
commit 9f486dc735
12 changed files with 1045 additions and 416 deletions

View File

@@ -1,6 +1,6 @@
/*
* Grove_LED_Matrix_Driver_HT16K33.h
* A library for Grove - LED Matrix Driver(HT16K33 with 8x8 LED Matrix)
* grove_dual_alphanumeric_display.h
* A library for Grove - dual_alphanumeric_display
*
* Copyright (c) 2018 seeed technology inc.
* Website : www.seeed.cc
@@ -8,12 +8,6 @@
* Create Time: 2018-06
* Version : 0.1
* Change Log :
* Copyright (c) 2018 seeed technology inc.
* Website : www.seeed.cc
* Author : downey
* Create Time: 2018-06
* Version : 1.1
* Change Log :for digital tube development.
*
* The MIT License (MIT)
*
@@ -36,126 +30,44 @@
* THE SOFTWARE.
*/
#ifndef __GROVE_LED_MATRIX_DRIVER_HT16K33__
#define __GROVE_LED_MATRIX_DRIVER_HT16K33__
#ifndef __GROVE_DUAL_ALPHANUMERIC_DISPLAY_H__
#define __GROVE_DUAL_ALPHANUMERIC_DISPLAY_H__
//#include "I2Cdev.h"
#include <Arduino.h>
#include "Wire.h"
#define HT16K33_DEFAULT_I2C_ADDR 0x71
#include "HT16K33_driver.h"
#define HT16K33_DEFAULT_I2C_ADDR 0x70
#define MAX_BIG_BUFFER_SIZE (8*20)
#define TUBE_COUNT 4
enum orientation_type_t
{
DISPLAY_ROTATE_0 = 0,
DISPLAY_ROTATE_90,
DISPLAY_ROTATE_180,
DISPLAY_ROTATE_270,
};
enum action_type_t
{
ACTION_SCROLLING = 0,
ACTION_SHIFT,
};
enum blink_type_t
{
BLINK_OFF = 0,
BLINK_2HZ,
BLINK_1HZ,
};
typedef enum
{
FIRST_TUBE = 1,
SECOND_TUBE,
THIRD_TUBE,
FOURTH_TUBE,
}TubeNum;
FIRST_TUBE,
}TubeNum_2;
class HT16K33 {
public:
HT16K33();
bool writeBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8_t* data);
void init(uint8_t addr=HT16K33_DEFAULT_I2C_ADDR);
void setBlinkRate(blink_type_t blink_type);
void setBrightness(uint8_t brightness);
virtual void clear();
protected:
uint8_t _addr;
};
class Digital_Tube : public HT16K33 {
class Digital_Tube2 : public HT16K33 {
public:
Digital_Tube();
Digital_Tube2();
void clear();
/**@brief Display number,If the param-num's len less than 4,The tubes display static number,otherwise,it displays scroll number.
* When it displays scroll number,the param interval is scrolling interval(ms) ..
* @param num the number to display.
* @param interval :the interval of scroll number.
* */
void displayNum(uint32_t num,uint32_t interval = 0);
/**@brief Display string,If the param-str's len less than 4,The tubes display static string,otherwise,it displays scroll string.
* When it displays scroll string,the param interval is scrolling interval(ms) ..
* @param str the str to display.
* @param interval :the interval of scroll string.
* */
void displayString(char *str,uint32_t interval = 0);
/**@brief Display all part of digital tube.
*
* */
void fulDisplay();
/**@brief Clear _buffer,just clear.
*
* */
void clearBuf();
/**@brief Display the contents of _buffer.
*
* */
void display();
void displayNum(unsigned long int num,unsigned int interval);
void displayString(char *str,unsigned int interval);
/**@brief Specify the display char of a digital tube.
* @param tube_num The number of tube ,total 4.
* @param num ,The number to display
* */
void setTubeSingleChar(TubeNum tube_num,char c);
void setDispBuf(TubeNum_2 num,char byte);
void displayFull();
void display_two_tube(char byte1,char byte2);
/**@brief Specify the display number of a digital tube.
* @param tube_num The number of tube ,total 4.
* @param num ,The number to display
* */
void setTubeSingleNum(TubeNum tube_num,char num);
/**@brief Set two points status.
* @prarm upper_on if true,the upper point light on ,otherwise turn off;
* @prarm lower_on if true,the upper point light on ,otherwise turn off;
* */
void setPoint(bool upper_on,bool lower_on);
private:
void display_one_tube(TubeNum tube_num,uint16_t value);
void replace_bit12(TubeNum tube_num,bool bit1,bool bit2);
void setTubeBuf(TubeNum tube_num,uint16_t value);
int get_char_index(char c);
void shiftDisplay(char *origin_disp_buf,char new_item);
// Low1 High1 Low2 High2 ... Low8 High8
uint8_t _buffer[16];
uint8_t _big_buffer[MAX_BIG_BUFFER_SIZE];
@@ -164,8 +76,6 @@ private:
orientation_type_t _orientation;
int8_t _offset_x, _offset_y;
bool isLegalToDisplay(char byte);
};
#endif //__GROVE_LED_MATRIX_DRIVER_HT16K33__