diff --git a/lib/Adafruit_NeoMatrix/examples/MatrixGFXDemo/MatrixGFXDemo.ino b/lib/Adafruit_NeoMatrix/examples/MatrixGFXDemo/MatrixGFXDemo.ino index 1960215b6f..30b19b2191 100644 --- a/lib/Adafruit_NeoMatrix/examples/MatrixGFXDemo/MatrixGFXDemo.ino +++ b/lib/Adafruit_NeoMatrix/examples/MatrixGFXDemo/MatrixGFXDemo.ino @@ -150,56 +150,56 @@ static const uint8_t PROGMEM mono_bmp[][8] = { { // 0: checkered 1 - B10101010, - B01010101, - B10101010, - B01010101, - B10101010, - B01010101, - B10101010, - B01010101, + 0b10101010, + 0b01010101, + 0b10101010, + 0b01010101, + 0b10101010, + 0b01010101, + 0b10101010, + 0b01010101, }, { // 1: checkered 2 - B01010101, - B10101010, - B01010101, - B10101010, - B01010101, - B10101010, - B01010101, - B10101010, + 0b01010101, + 0b10101010, + 0b01010101, + 0b10101010, + 0b01010101, + 0b10101010, + 0b01010101, + 0b10101010, }, { // 2: smiley - B00111100, - B01000010, - B10100101, - B10000001, - B10100101, - B10011001, - B01000010, - B00111100 }, + 0b00111100, + 0b01000010, + 0b10100101, + 0b10000001, + 0b10100101, + 0b10011001, + 0b01000010, + 0b00111100 }, { // 3: neutral - B00111100, - B01000010, - B10100101, - B10000001, - B10111101, - B10000001, - B01000010, - B00111100 }, + 0b00111100, + 0b01000010, + 0b10100101, + 0b10000001, + 0b10111101, + 0b10000001, + 0b01000010, + 0b00111100 }, { // 4; frowny - B00111100, - B01000010, - B10100101, - B10000001, - B10011001, - B10100101, - B01000010, - B00111100 }, + 0b00111100, + 0b01000010, + 0b10100101, + 0b10000001, + 0b10011001, + 0b10100101, + 0b01000010, + 0b00111100 }, }; static const uint16_t PROGMEM diff --git a/lib/HeatpumpIR/ZHJG01HeatpumpIR.cpp b/lib/HeatpumpIR/ZHJG01HeatpumpIR.cpp index 1a37066d5a..5d440caa3e 100644 --- a/lib/HeatpumpIR/ZHJG01HeatpumpIR.cpp +++ b/lib/HeatpumpIR/ZHJG01HeatpumpIR.cpp @@ -108,16 +108,16 @@ void ZHJG01HeatpumpIR::sendZHJG01(IRSender& IR, /******************************************************************************** * Byte[0]: Turbo, Eco, Fan, Vertical Swing - * TURBO ON: B0x1xxxxx - * ECO ON: B0x0xxxxx - * TURBO/ECO OFF: B1xxxxxxx - * FAN1: Bx00xxxxx - * FAN2: Bx01xxxxx - * FAN3: Bx10xxxxx - * FAN AUTO: Bx11xxxxx - * VERTICAL FIXED: Bxxx01xxx - * VERTICAL SWING: Bxxx10xxx - * VERTICAL WIND: Bxxx11xxx + * TURBO ON: 0b0x1xxxxx + * ECO ON: 0b0x0xxxxx + * TURBO/ECO OFF: 0b1xxxxxxx + * FAN1: 0bx00xxxxx + * FAN2: 0bx01xxxxx + * FAN3: 0bx10xxxxx + * FAN AUTO: 0bx11xxxxx + * VERTICAL FIXED: 0bxxx01xxx + * VERTICAL SWING: 0bxxx10xxx + * VERTICAL WIND: 0bxxx11xxx *******************************************************************************/ ZHJG01Template[1] = fanSpeed | swingV; ZHJG01Template[0] = ~ ZHJG01Template[1]; @@ -125,13 +125,13 @@ void ZHJG01HeatpumpIR::sendZHJG01(IRSender& IR, /******************************************************************************** * Byte[2]: Temp, Power, Mode * TEMP: Bttttxxxx - * POWER ON: Bxxxx0xxx - * POWER OFF: Bxxxx1xxx - * MODE HEAT: Bxxxxx011 - * MODE VENT: Bxxxxx100 - * MODE DRY: Bxxxxx101 - * MODE COOL: Bxxxxx110 - * MODE AUTO: Bxxxxx111 + * POWER ON: 0bxxxx0xxx + * POWER OFF: 0bxxxx1xxx + * MODE HEAT: 0bxxxxx011 + * MODE VENT: 0bxxxxx100 + * MODE DRY: 0bxxxxx101 + * MODE COOL: 0bxxxxx110 + * MODE AUTO: 0bxxxxx111 *******************************************************************************/ uint8_t tempBits = ((temperature - 17) << 4) & 0b11110000; diff --git a/lib/HeatpumpIR/ZHJG01HeatpumpIR.h b/lib/HeatpumpIR/ZHJG01HeatpumpIR.h index c91f2d007e..e88d66fdd6 100644 --- a/lib/HeatpumpIR/ZHJG01HeatpumpIR.h +++ b/lib/HeatpumpIR/ZHJG01HeatpumpIR.h @@ -22,14 +22,14 @@ * Every UNeven Byte (01,03,05,07 and 09) hold a checksum of the corresponding * command by inverting the bits, for example: * - * The identifier byte[0] = 0xD5 = B1101 0101 - * The checksum byte[1] = 0x2A = B0010 1010 + * The identifier byte[0] = 0xD5 = 0b1101 0101 + * The checksum byte[1] = 0x2A = 0b0010 1010 * * So, you can check the message by: * - inverting the bits of the checksum byte with the corresponding command, they * should be the same, or * - Summing up the checksum byte and the corresponding command, - * they should always add up to 0xFF = B11111111 = 255 + * they should always add up to 0xFF = 0b11111111 = 255 * * ****************************************************************************** * Written by: Abílio Costa diff --git a/lib/HeatpumpIR/ZHLT01HeatpumpIR.cpp b/lib/HeatpumpIR/ZHLT01HeatpumpIR.cpp index 3030183e8a..e1902d1bea 100644 --- a/lib/HeatpumpIR/ZHLT01HeatpumpIR.cpp +++ b/lib/HeatpumpIR/ZHLT01HeatpumpIR.cpp @@ -149,29 +149,29 @@ void ZHLT01HeatpumpIR::sendZHLT01(IRSender& IR, uint8_t powerMode, /******************************************************************************** * Byte[07]: POWER, FAN, SLEEP, HORIZONTAL, VERTICAL - * POWER ON: B0xxxxx1x - * POWER OFF: B0xxxxx0x - * VERTICAL SWING: B0xxx01xx - * VERTICAL WIND: B0xxx00xx - * VERTICAL FIXED: B0xxx10xx - * HORIZONTAL SWING: B0xx0xxxx - * HORIZONTAL OFF: B0xx1xxxx - * FAN AUTO: B000xxxx0 - * FAN SILENT: B000xxxx1 - * FAN3: B001xxxx0 - * FAN2: B010xxxx0 - * FAN1: B011xxxx0 + * POWER ON: 0b0xxxxx1x + * POWER OFF: 0b0xxxxx0x + * VERTICAL SWING: 0b0xxx01xx + * VERTICAL WIND: 0b0xxx00xx + * VERTICAL FIXED: 0b0xxx10xx + * HORIZONTAL SWING: 0b0xx0xxxx + * HORIZONTAL OFF: 0b0xx1xxxx + * FAN AUTO: 0b000xxxx0 + * FAN SILENT: 0b000xxxx1 + * FAN3: 0b001xxxx0 + * FAN2: 0b010xxxx0 + * FAN1: 0b011xxxx0 *******************************************************************************/ ZHLT01Template[7] = fanSpeed | powerMode | swingV | swingH; ZHLT01Template[6] = ~ ZHLT01Template[7]; /******************************************************************************** * Byte[09]: Mode, Temperature - * MODE AUTO: B000xxxxx - * MODE COOL: B001xxxxx - * MODE VENT: B011xxxxx - * MODE DRY: B010xxxxx - * MODE HEAT: B100xxxxx + * MODE AUTO: 0b000xxxxx + * MODE COOL: 0b001xxxxx + * MODE VENT: 0b011xxxxx + * MODE DRY: 0b010xxxxx + * MODE HEAT: 0b100xxxxx * Temperature is determined by bit0-4: * 0x00 = 16C * 0x10 = 32C diff --git a/lib/HeatpumpIR/ZHLT01HeatpumpIR.h b/lib/HeatpumpIR/ZHLT01HeatpumpIR.h index 33e9623e4c..d402afd876 100644 --- a/lib/HeatpumpIR/ZHLT01HeatpumpIR.h +++ b/lib/HeatpumpIR/ZHLT01HeatpumpIR.h @@ -41,14 +41,14 @@ * Every EVEN Byte (00,02,04,06,08 and 10) holds a checksum of the corresponding * command-, or identifier-byte by _inverting_ the bits, for example: * - * The identifier byte[11] = 0xD5 = B1101 0101 - * The checksum byte[10] = 0x2A = B0010 1010 + * The identifier byte[11] = 0xD5 = 0b1101 0101 + * The checksum byte[10] = 0x2A = 0b0010 1010 * * So, you can check the message by: * - inverting the bits of the checksum byte with the corresponding command-, or * identifier byte, they should me the same, or * - Summing up the checksum byte and the corresponding command-, or identifier byte, - * they should always add up to 0xFF = B11111111 = 255 + * they should always add up to 0xFF = 0b11111111 = 255 * * Control bytes: * [01] - Timer (1-24 hours, Off) diff --git a/lib/IRremoteESP8266/examples/LGACSend/LGACSend.ino b/lib/IRremoteESP8266/examples/LGACSend/LGACSend.ino index 9139983c91..1625232eee 100644 --- a/lib/IRremoteESP8266/examples/LGACSend/LGACSend.ino +++ b/lib/IRremoteESP8266/examples/LGACSend/LGACSend.ino @@ -75,7 +75,7 @@ void Ac_Activate(unsigned int temperature, unsigned int air_flow, // calculating using other values unsigned int ac_msbits7 = (ac_msbits3 + ac_msbits4 + ac_msbits5 + - ac_msbits6) & B00001111; + ac_msbits6) & 0b00001111; ac_code_to_sent = ac_msbits1 << 4; ac_code_to_sent = (ac_code_to_sent + ac_msbits2) << 4; ac_code_to_sent = (ac_code_to_sent + ac_msbits3) << 4; diff --git a/lib/IRremoteESP8266/src/ir_Gree.cpp b/lib/IRremoteESP8266/src/ir_Gree.cpp index 2c44cfe523..38c0325fcf 100644 --- a/lib/IRremoteESP8266/src/ir_Gree.cpp +++ b/lib/IRremoteESP8266/src/ir_Gree.cpp @@ -715,7 +715,7 @@ bool IRrecv::decodeGree(decode_results* results, uint16_t offset, if (used == 0) return false; offset += used; - // Block #1 footer (3 bits, B010) + // Block #1 footer (3 bits, 0b010) match_result_t data_result; data_result = matchData(&(results->rawbuf[offset]), kGreeBlockFooterBits, kGreeBitMark, kGreeOneSpace, kGreeBitMark, diff --git a/lib/IRremoteESP8266/src/ir_Kelvinator.cpp b/lib/IRremoteESP8266/src/ir_Kelvinator.cpp index c44f7c6839..9d23384dbf 100644 --- a/lib/IRremoteESP8266/src/ir_Kelvinator.cpp +++ b/lib/IRremoteESP8266/src/ir_Kelvinator.cpp @@ -540,7 +540,7 @@ bool IRrecv::decodeKelvinator(decode_results *results, uint16_t offset, offset += used; pos += 4; - // Command data footer (3 bits, B010) + // Command data footer (3 bits, 0b010) data_result = matchData( &(results->rawbuf[offset]), kKelvinatorCmdFooterBits, kKelvinatorBitMark, kKelvinatorOneSpace, diff --git a/lib/LiquidCrystal_I2C/LiquidCrystal_I2C.h b/lib/LiquidCrystal_I2C/LiquidCrystal_I2C.h index f7c7d132c3..5f82ae504d 100755 --- a/lib/LiquidCrystal_I2C/LiquidCrystal_I2C.h +++ b/lib/LiquidCrystal_I2C/LiquidCrystal_I2C.h @@ -48,9 +48,9 @@ #define LCD_BACKLIGHT 0x08 #define LCD_NOBACKLIGHT 0x00 -#define En B00000100 // Enable bit -#define Rw B00000010 // Read/Write bit -#define Rs B00000001 // Register select bit +#define En 0b00000100 // Enable bit +#define Rw 0b00000010 // Read/Write bit +#define Rs 0b00000001 // Register select bit class LiquidCrystal_I2C : public Print { public: diff --git a/lib/RAK12019_LTR390/src/UVlight_LTR390.cpp b/lib/RAK12019_LTR390/src/UVlight_LTR390.cpp index e06a2fec03..31a8c17e9d 100644 --- a/lib/RAK12019_LTR390/src/UVlight_LTR390.cpp +++ b/lib/RAK12019_LTR390/src/UVlight_LTR390.cpp @@ -96,7 +96,7 @@ bool UVlight_LTR390::init(bool doReset) { bool UVlight_LTR390::reset(void) { uint8_t readData = readRegister(LTR390_MAIN_CTRL); - readData |= B00010000; + readData |= 0b00010000; writeRegister(LTR390_MAIN_CTRL, readData); delay(10); diff --git a/lib/SparkFun_ADXL345_Arduino_Library/src/SparkFun_ADXL345.cpp b/lib/SparkFun_ADXL345_Arduino_Library/src/SparkFun_ADXL345.cpp index 928d8d3309..36e14a92bf 100644 --- a/lib/SparkFun_ADXL345_Arduino_Library/src/SparkFun_ADXL345.cpp +++ b/lib/SparkFun_ADXL345_Arduino_Library/src/SparkFun_ADXL345.cpp @@ -199,7 +199,7 @@ void ADXL345::getRangeSetting(byte *rangeSetting) { byte _b; readFrom(ADXL345_DATA_FORMAT, 1, &_b); - *rangeSetting = _b & B00000011; + *rangeSetting = _b & 0b00000011; } void ADXL345::setRangeSetting(int val) { @@ -208,22 +208,22 @@ void ADXL345::setRangeSetting(int val) { switch (val) { case 2: - _s = B00000000; + _s = 0b00000000; break; case 4: - _s = B00000001; + _s = 0b00000001; break; case 8: - _s = B00000010; + _s = 0b00000010; break; case 16: - _s = B00000011; + _s = 0b00000011; break; default: - _s = B00000000; + _s = 0b00000000; } readFrom(ADXL345_DATA_FORMAT, 1, &_b); - _s |= (_b & B11101100); + _s |= (_b & 0b11101100); writeTo(ADXL345_DATA_FORMAT, _s); } @@ -700,7 +700,7 @@ double ADXL345::getRate() { byte _b; readFrom(ADXL345_BW_RATE, 1, &_b); - _b &= B00001111; + _b &= 0b00001111; return (pow(2, ((int)_b) - 6)) * 6.25; } @@ -716,7 +716,7 @@ void ADXL345::setRate(double rate) { if (r <= 9) { readFrom(ADXL345_BW_RATE, 1, &_b); - _s = (byte)(r + 6) | (_b & B11110000); + _s = (byte)(r + 6) | (_b & 0b11110000); writeTo(ADXL345_BW_RATE, _s); } } diff --git a/lib/esp8266-oled-ssd1306/OLED_SSD1306_SH1106_images.h b/lib/esp8266-oled-ssd1306/OLED_SSD1306_SH1106_images.h index 3595e65609..7e9d95bb8c 100644 --- a/lib/esp8266-oled-ssd1306/OLED_SSD1306_SH1106_images.h +++ b/lib/esp8266-oled-ssd1306/OLED_SSD1306_SH1106_images.h @@ -14,25 +14,25 @@ const char espeasy_logo_bits[] PROGMEM= { 0x3e, 0x3c, 0x00, 0x3f, 0x1e, 0x1c, 0x00, 0x1e, 0x04, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; const char activeSymbole[] PROGMEM = { - B00000000, - B00000000, - B00011000, - B00100100, - B01000010, - B01000010, - B00100100, - B00011000 + 0b00000000, + 0b00000000, + 0b00011000, + 0b00100100, + 0b01000010, + 0b01000010, + 0b00100100, + 0b00011000 }; const char inactiveSymbole[] PROGMEM = { - B00000000, - B00000000, - B00000000, - B00000000, - B00011000, - B00011000, - B00000000, - B00000000 + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00011000, + 0b00011000, + 0b00000000, + 0b00000000 }; #endif diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 70c35edabd..afacd0cfcb 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -211,13 +211,14 @@ lib_ignore = ;platform = https://github.com/Jason2866/platform-espressif32.git platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.02.10/platform-espressif32.zip ;platform_packages = -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/2036/framework-arduinoespressif32-release_v5.1-246cad0.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/2151/framework-arduinoespressif32-release_v5.1-1a0b6e0.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 -DDISABLE_SC16IS752_SPI -DCONFIG_PM_ENABLE -DCONFIG_LWIP_L2_TO_L3_COPY + -DETH_SPI_SUPPORTS_NO_IRQ=1 -DCONFIG_FREERTOS_USE_TICKLESS_IDLE=1 -DCONFIG_FREERTOS_IDLE_TIME_BEFORE_SLEEP=3 -DNEOPIXEL_ESP32_RMT_DEFAULT diff --git a/src/_P073_7DGT.ino b/src/_P073_7DGT.ino index ac50107feb..1e3102f1b7 100644 --- a/src/_P073_7DGT.ino +++ b/src/_P073_7DGT.ino @@ -1071,7 +1071,7 @@ void tm1637_i2cWrite(uint8_t clk_pin, for (i = 0; i < 8; i++) { CLK_LOW(); - if (bytetoprint & B00000001) { + if (bytetoprint & 0b00000001) { DIO_HIGH(); } else { DIO_LOW(); diff --git a/src/src/PluginStructs/P014_data_struct.cpp b/src/src/PluginStructs/P014_data_struct.cpp index 084ebf8653..b1eaa53c39 100644 --- a/src/src/PluginStructs/P014_data_struct.cpp +++ b/src/src/PluginStructs/P014_data_struct.cpp @@ -424,7 +424,7 @@ bool P014_data_struct::enablePowerForADC(uint8_t i2caddr){ if (i2caddr == SI7013_I2C_ADDRESS_AD0_1){ - ok = I2C_write8_reg(i2caddr,SI7013_WRITE_REG2, (reg & B11111000) | (2+4+64) );//set last three bits (VIN bufered, Vref=VDD, VOUT=GND) and No-Hold for bit 6 + ok = I2C_write8_reg(i2caddr,SI7013_WRITE_REG2, (reg & 0b11111000) | (2+4+64) );//set last three bits (VIN bufered, Vref=VDD, VOUT=GND) and No-Hold for bit 6 }else{ ok = I2C_write8_reg(i2caddr,SI7013_WRITE_REG2,reg | (1+2+4+64) );//set last three bits to 1 (VIN bufered, Vref=VDD, VOUT=VDD) and No-Hold for bit 6 } @@ -455,7 +455,7 @@ bool P014_data_struct::disablePowerForADC(uint8_t i2caddr){ if (i2caddr == SI7013_I2C_ADDRESS_AD0_1){ ok = I2C_write8_reg(i2caddr,SI7013_WRITE_REG2,reg | (1+2+4+64) );//set last three bits to 1 (VIN bufered, Vref=VDD, VOUT=VDD) and No-Hold for bit 6 }else{ - ok = I2C_write8_reg(i2caddr,SI7013_WRITE_REG2, (reg & B11111000) | (2+4+64) );//set last three bits (VIN bufered, Vref=VDD, VOUT=GND) and No-Hold for bit 6 + ok = I2C_write8_reg(i2caddr,SI7013_WRITE_REG2, (reg & 0b11111000) | (2+4+64) );//set last three bits (VIN bufered, Vref=VDD, VOUT=GND) and No-Hold for bit 6 } if (!ok){ addLog(LOG_LEVEL_ERROR, F("SI7013: Could not write REG2!")); diff --git a/src/src/PluginStructs/P014_data_struct.h b/src/src/PluginStructs/P014_data_struct.h index ddb2971fc5..19b426755d 100644 --- a/src/src/PluginStructs/P014_data_struct.h +++ b/src/src/PluginStructs/P014_data_struct.h @@ -18,7 +18,7 @@ # define SI70xx_RESOLUTION_13T_10RH 0x80 // 10 bits RH / 13 bits Temp # define SI70xx_RESOLUTION_12T_08RH 0x01 // 8 bits RH / 12 bits Temp # define SI70xx_RESOLUTION_11T_11RH 0x81 // 11 bits RH / 11 bits Temp -# define SI70xx_RESOLUTION_MASK B01111110 +# define SI70xx_RESOLUTION_MASK 0b01111110 @@ -40,7 +40,7 @@ #define SI7013_READ_ADC 0xEE #define SI7013_READ_REG2 0x10 #define SI7013_WRITE_REG2 0x50 -#define SI7013_REG2_DEFAULT B01000110 // (MeasureMode=10) No-Hold master with no thermistor correction ; 7ms conversion; (VIN bufered, Vref=VDD, VOUT=GND) +#define SI7013_REG2_DEFAULT 0b01000110 // (MeasureMode=10) No-Hold master with no thermistor correction ; 7ms conversion; (VIN bufered, Vref=VDD, VOUT=GND) #define SI70xx_CMD_ID1 0xFA0F /**< Read Electronic ID SNA Bytes */ #define SI70xx_CMD_ID2 0xFCC9 /**< Read Electronic ID SNB Bytes */ diff --git a/src/src/PluginStructs/P031_data_struct.h b/src/src/PluginStructs/P031_data_struct.h index ab78b665ea..4a1e2c1217 100644 --- a/src/src/PluginStructs/P031_data_struct.h +++ b/src/src/PluginStructs/P031_data_struct.h @@ -23,10 +23,10 @@ class P031_data_struct : public PluginTaskData_base { public: enum { - SHT1X_CMD_MEASURE_TEMP = B00000011, - SHT1X_CMD_MEASURE_RH = B00000101, - SHT1X_CMD_READ_STATUS = B00000111, - SHT1X_CMD_SOFT_RESET = B00011110 + SHT1X_CMD_MEASURE_TEMP = 0b00000011, + SHT1X_CMD_MEASURE_RH = 0b00000101, + SHT1X_CMD_READ_STATUS = 0b00000111, + SHT1X_CMD_SOFT_RESET = 0b00011110 }; P031_data_struct() = default; diff --git a/src/src/PluginStructs/P073_data_struct.h b/src/src/PluginStructs/P073_data_struct.h index 065232dd9a..868e43da11 100644 --- a/src/src/PluginStructs/P073_data_struct.h +++ b/src/src/PluginStructs/P073_data_struct.h @@ -40,8 +40,8 @@ # undef P073_SUPPRESS_ZERO // Optionally activate if .bin file space is really problematic, to remove the Suppress leading zero feature # endif // ifndef PLUGIN_SET_COLLECTION -# define TM1637_POWER_ON B10001000 -# define TM1637_POWER_OFF B10000000 +# define TM1637_POWER_ON 0b10001000 +# define TM1637_POWER_OFF 0b10000000 # define TM1637_CLOCKDELAY 40 # define TM1637_4DIGIT 4 # define TM1637_6DIGIT 2 @@ -57,13 +57,13 @@ // - pos 15 - underscore "_" // - pos 16-41 - Letters from A to Z static const uint8_t DefaultCharTable[42] PROGMEM = { - B01111110, B00110000, B01101101, B01111001, B00110011, B01011011, - B01011111, B01110000, B01111111, B01111011, B00000000, B00000001, - B01100011, B00001001, B01001001, B00001000, B01110111, B00011111, - B01001110, B00111101, B01001111, B01000111, B01011110, B00110111, - B00000110, B00111100, B01010111, B00001110, B01010100, B01110110, - B01111110, B01100111, B01101011, B01100110, B01011011, B00001111, - B00111110, B00111110, B00101010, B00110111, B00111011, B01101101 }; + 0b01111110, 0b00110000, 0b01101101, 0b01111001, 0b00110011, 0b01011011, + 0b01011111, 0b01110000, 0b01111111, 0b01111011, 0b00000000, 0b00000001, + 0b01100011, 0b00001001, 0b01001001, 0b00001000, 0b01110111, 0b00011111, + 0b01001110, 0b00111101, 0b01001111, 0b01000111, 0b01011110, 0b00110111, + 0b00000110, 0b00111100, 0b01010111, 0b00001110, 0b01010100, 0b01110110, + 0b01111110, 0b01100111, 0b01101011, 0b01100110, 0b01011011, 0b00001111, + 0b00111110, 0b00111110, 0b00101010, 0b00110111, 0b00111011, 0b01101101 }; # ifdef P073_EXTRA_FONTS @@ -78,46 +78,46 @@ static const uint8_t DefaultCharTable[42] PROGMEM = { // - pos 14 - slash "/" // - pos 15 - underscore "_" // - pos 16-40 - Special characters not handled yet -- MAX7219 -- -- TM1637 -- -// - pos 16 - percent "%" B00010010 -// - pos 17 - at "@" B01110100 -// - pos 18 - period "." B00000100 -// - pos 10 - comma "," B00011000 -// - pos 20 - semicolon ";" B00101000 -// - pos 21 - colon ":" B01001000 -// - pos 22 - plus "+" B00110001 -// - pos 23 - asterisk "*" B01001001 -// - pos 24 - hash "#" B00110110 -// - pos 25 - exclamation mark "!" B01101011 -// - pos 26 - question mark "?" B01101001 -// - pos 27 - single quote "'" B00000010 -// - pos 28 - double quote '"' B00100010 -// - pos 29 - left sharp bracket "<" B01000010 -// - pos 30 - right sharp bracket ">" B01100000 -// - pos 31 - backslash "\" B00010011 -// - pos 32 - left round bracket "(" B01001110 -// - pos 33 - right round bracket ")" B01111000 -// - pos 34 - overscore "|" (the top-most line) B01000000 -// - pos 35 - uppercase C "C" (optionally enabled) B01001110 -// - pos 36 - uppercase H "H" B00110111 -// - pos 37 - uppercase N "N" B01110110 -// - pos 38 - uppercase O "O" B01111110 -// - pos 39 - uppercase R "R" B01100110 -// - pos 40 - uppercase U "U" B00111110 -// - pos 41 - uppercase X "X" B00110111 +// - pos 16 - percent "%" 0b00010010 +// - pos 17 - at "@" 0b01110100 +// - pos 18 - period "." 0b00000100 +// - pos 10 - comma "," 0b00011000 +// - pos 20 - semicolon ";" 0b00101000 +// - pos 21 - colon ":" 0b01001000 +// - pos 22 - plus "+" 0b00110001 +// - pos 23 - asterisk "*" 0b01001001 +// - pos 24 - hash "#" 0b00110110 +// - pos 25 - exclamation mark "!" 0b01101011 +// - pos 26 - question mark "?" 0b01101001 +// - pos 27 - single quote "'" 0b00000010 +// - pos 28 - double quote '"' 0b00100010 +// - pos 29 - left sharp bracket "<" 0b01000010 +// - pos 30 - right sharp bracket ">" 0b01100000 +// - pos 31 - backslash "\" 0b00010011 +// - pos 32 - left round bracket "(" 0b01001110 +// - pos 33 - right round bracket ")" 0b01111000 +// - pos 34 - overscore "|" (the top-most line) 0b01000000 +// - pos 35 - uppercase C "C" (optionally enabled) 0b01001110 +// - pos 36 - uppercase H "H" 0b00110111 +// - pos 37 - uppercase N "N" 0b01110110 +// - pos 38 - uppercase O "O" 0b01111110 +// - pos 39 - uppercase R "R" 0b01100110 +// - pos 40 - uppercase U "U" 0b00111110 +// - pos 41 - uppercase X "X" 0b00110111 // - pos 42-67 - Letters from A to Z Siekoo style static const uint8_t SiekooCharTable[68] PROGMEM = { - B01111110, B00110000, B01101101, B01111001, B00110011, B01011011, - B01011111, B01110000, B01111111, B01111011, B00000000, B00000001, - B01100011, B00001001, B00100101, B00001000, B00010010, B01110100, - B00000100, B00011000, B00101000, B01001000, B00110001, B01001001, - B00110110, B01101011, B01101001, B00000010, B00100010, B01000010, - B01100000, B00010011, B01001110, B01111000, B01000000, B01001110, - B00110111, B01110110, B01111110, B01100110, B00111110, B00110111, - B01111101, B00011111, B00001101, B00111101, B01001111, B01000111, /* ABCDEF */ - B01011110, B00010111, B01000100, B01011000, B01010111, B00001110, - B01010101, B00010101, B00011101, B01100111, B01110011, B00000101, - B01011010, B00001111, B00011100, B00101010, B00101011, B00010100, - B00111011, B01101100 }; + 0b01111110, 0b00110000, 0b01101101, 0b01111001, 0b00110011, 0b01011011, + 0b01011111, 0b01110000, 0b01111111, 0b01111011, 0b00000000, 0b00000001, + 0b01100011, 0b00001001, 0b00100101, 0b00001000, 0b00010010, 0b01110100, + 0b00000100, 0b00011000, 0b00101000, 0b01001000, 0b00110001, 0b01001001, + 0b00110110, 0b01101011, 0b01101001, 0b00000010, 0b00100010, 0b01000010, + 0b01100000, 0b00010011, 0b01001110, 0b01111000, 0b01000000, 0b01001110, + 0b00110111, 0b01110110, 0b01111110, 0b01100110, 0b00111110, 0b00110111, + 0b01111101, 0b00011111, 0b00001101, 0b00111101, 0b01001111, 0b01000111, /* ABCDEF */ + 0b01011110, 0b00010111, 0b01000100, 0b01011000, 0b01010111, 0b00001110, + 0b01010101, 0b00010101, 0b00011101, 0b01100111, 0b01110011, 0b00000101, + 0b01011010, 0b00001111, 0b00011100, 0b00101010, 0b00101011, 0b00010100, + 0b00111011, 0b01101100 }; // dSEG7 https://www.keshikan.net/fonts-e.html // specials: @@ -130,13 +130,13 @@ static const uint8_t SiekooCharTable[68] PROGMEM = { // - pos 15 - underscore "_" // - pos 16-41 - Letters from A to Z dSEG7 style static const uint8_t Dseg7CharTable[42] PROGMEM = { - B01111110, B00110000, B01101101, B01111001, B00110011, B01011011, - B01011111, B01110000, B01111111, B01111011, B00000000, B00000001, - B01100011, B00001001, B01001001, B00001000, B01110111, B00011111, /* AB */ - B00001101, B00111101, B01001111, B01000111, B01011110, B00010111, - B00010000, B00111100, B01010111, B00001110, B01110110, B00010101, - B00011101, B01100111, B01110011, B00000101, B00011011, B00001111, - B00011100, B00111110, B00111111, B00110111, B00111011, B01101100 }; + 0b01111110, 0b00110000, 0b01101101, 0b01111001, 0b00110011, 0b01011011, + 0b01011111, 0b01110000, 0b01111111, 0b01111011, 0b00000000, 0b00000001, + 0b01100011, 0b00001001, 0b01001001, 0b00001000, 0b01110111, 0b00011111, /* AB */ + 0b00001101, 0b00111101, 0b01001111, 0b01000111, 0b01011110, 0b00010111, + 0b00010000, 0b00111100, 0b01010111, 0b00001110, 0b01110110, 0b00010101, + 0b00011101, 0b01100111, 0b01110011, 0b00000101, 0b00011011, 0b00001111, + 0b00011100, 0b00111110, 0b00111111, 0b00110111, 0b00111011, 0b01101100 }; # endif // P073_EXTRA_FONTS