Skip to content

Commit

Permalink
Release 6.0.9
Browse files Browse the repository at this point in the history
  • Loading branch information
rei-vilo committed May 11, 2023
1 parent 3aa01e8 commit f9a08c3
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 17 deletions.
6 changes: 3 additions & 3 deletions src/Screen_EPD_EXT3.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -361,8 +361,8 @@ void Screen_EPD_EXT3_Fast::begin()
_invert = false;

// Report
Serial.println("= Screen %s %ix%i", WhoAmI(), screenSizeX(), screenSizeY());
Serial.println("= PDLS v%i", SCREEN_EPD_EXT3_RELEASE);
Serial.println(formatString("= Screen %s %ix%i", WhoAmI(), screenSizeX(), screenSizeY()));
Serial.println(formatString("= PDLS v%i", SCREEN_EPD_EXT3_RELEASE));

clear();

Expand Down Expand Up @@ -776,7 +776,7 @@ uint8_t Screen_EPD_EXT3_Fast::flushMode(uint8_t updateMode)

default:

Serial.println(LEVEL_ERROR, "UPDATE_NONE invoked");
Serial.println("* PDLS - UPDATE_NONE invoked");
break;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Screen_EPD_EXT3.h
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ class Screen_EPD_EXT3_Fast final : public hV_Screen_Buffer

// Screen independent variables
uint8_t * _newImage;
bool _invert;
bool _invert = false;
uint16_t _screenSizeV, _screenSizeH;
int8_t _temperature = 25;

Expand Down
10 changes: 5 additions & 5 deletions src/hV_Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
// Constants
#include "hV_Constants.h"

#if (hV_CONSTANTS_RELEASE < 601)
#error Required hV_CONSTANTS_RELEASE 601
#if (hV_CONSTANTS_RELEASE < 607)
#error Required hV_CONSTANTS_RELEASE 607
#endif // hV_CONSTANTS_RELEASE

#ifndef hV_CONFIGURATION_RELEASE
Expand Down Expand Up @@ -640,9 +640,9 @@ const pins_t boardTeensy3x =
///
/// @name 7- Set touch mode
/// @details Only two screens are ready for touch
/// * Basic edition: iTC 2.70 BW and iTC 3.70 BW
/// * Evaluation edition: iTC 2.70 BW and iTC 3.70 BW
/// * Commercial edition: iTC 2.70 BW and iTC 3.70 BW
/// * Basic edition: iTC 2.71 BW and iTC 3.70 BW
/// * Evaluation edition: iTC 2.71 BW and iTC 3.70 BW
/// * Commercial edition: iTC 2.71 BW and iTC 3.70 BW
/// @note Touch uses I2C and polling over interrupt
/// @{
#define USE_TOUCH_NONE 0 ///< Do not use touch
Expand Down
43 changes: 35 additions & 8 deletions src/hV_Constants.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
/// @n Based on highView technology
///
/// @author Rei Vilo
/// @date 20 Apr 2023
/// @version 608
/// @date 02 May 2023
/// @version 609
///
/// @copyright (c) Rei Vilo, 2010-2023
/// @copyright All rights reserved
Expand All @@ -29,7 +29,7 @@
///
/// @brief Release
///
#define hV_CONSTANTS_RELEASE 608
#define hV_CONSTANTS_RELEASE 609
#endif // hV_CONSTANTS_RELEASE

///
Expand All @@ -41,23 +41,28 @@
/// * General parameters
///
/// @brief Specific features
/// @note Numbers are bit-based and or-combinable
/// @{
#define FEATURE_FAST 0x01 ///< With capacitive touch panel
#define FEATURE_TOUCH 0x02 ///< With embedded fast update
#define FEATURE_FAST 0x01 ///< With embedded fast update
#define FEATURE_TOUCH 0x02 ///< With capacitive touch panel
#define FEATURE_OTHER 0x04 ///< With other feature
#define FEATURE_WIDE_TEMPERATURE 0x08 ///< With wide operating temperature
#define FEATURE_RED 0x10 ///< With red colour
/// @}

///
/// @brief Update mode
/// @note Numbers are sequential and exclusive
/// @{
#define UPDATE_GLOBAL 0x00 ///< Global update, default
#define UPDATE_FAST 0x01 ///< Fast update
#define UPDATE_PARTIAL 0x02 ///< Partial update
#define UPDATE_NONE 0x00 ///< No update
#define UPDATE_GLOBAL 0x01 ///< Global update, default
#define UPDATE_FAST 0x02 ///< Fast update
#define UPDATE_PARTIAL 0x03 ///< Partial update
/// @}

///
/// @brief Large screens sub-panels selection
/// @note Numbers are sequential and exclusive
/// @{
#define PANEL_CS_MAIN 0x01 ///< Large screens sub-panels: first panel only
#define PANEL_CS_SECOND 0x02 ///< Large screens sub-panels: second panel only
Expand All @@ -66,6 +71,7 @@

///
/// @brief Power state
/// @note Numbers are sequential and exclusive
/// @{
#define FSM_POWER_UNKNOWN 0x00 ///< Unknown
#define FSM_POWER_ON 0x01 ///< On
Expand All @@ -74,14 +80,25 @@

///
/// @brief Partial update state
/// @note Numbers are sequential and exclusive
/// @{
#define PARTIAL_OFF 0x00 ///< Non-activated
#define PARTIAL_ON 0x01 ///< Activated but not populated
#define PARTIAL_READY 0x02 ///< Activated and populated
/// @}

///
/// @brief Continuity mode state
/// @note Numbers are sequential and exclusive
/// @{
#define CONTINUITY_OFF 0x00 ///< Non-activated
#define CONTINUITY_ON 0x01 ///< Activated but not initialised
#define CONTINUITY_READY 0x02 ///< Activated and initialised
/// @}

///
/// @brief Touch events
/// @note Numbers are sequential and exclusive
/// @{
#define TOUCH_EVENT_NONE 0 ///< No touch event
#define TOUCH_EVENT_PRESS 1 ///< Touch press event
Expand All @@ -92,8 +109,18 @@

///
/// @brief Results
/// @note Numbers are sequential and exclusive
/// @{
#define RESULT_SUCCESS 0 ///< Success
#define RESULT_ERROR 1 ///< Error
/// @}
///

///
/// @brief Orientation constants
/// @{
///
#define ORIENTATION_PORTRAIT 6 ///< Portrait or vertical, higher than large
#define ORIENTATION_LANDSCAPE 7 ///< Landscape or horizontal, larger than high
/// @}
///

0 comments on commit f9a08c3

Please sign in to comment.