diff --git a/src/graphics/emotes.cpp b/src/graphics/emotes.cpp index 51d82d610..fa86891ce 100644 --- a/src/graphics/emotes.cpp +++ b/src/graphics/emotes.cpp @@ -9,187 +9,176 @@ namespace graphics const Emote emotes[] = { #ifndef EXCLUDE_EMOJI // --- Thumbs --- - {"\U0001F44D", thumbup, thumbs_width, thumbs_height}, // ๐Ÿ‘ Thumbs Up - {"\U0001F44E", thumbdown, thumbs_width, thumbs_height}, // ๐Ÿ‘Ž Thumbs Down + {"\U0001F44D", "thumbup", thumbup, thumbs_width, thumbs_height}, // ๐Ÿ‘ Thumbs Up + {"\U0001F44E", "thumbdown", thumbdown, thumbs_width, thumbs_height}, // ๐Ÿ‘Ž Thumbs Down // --- Smileys (Multiple Unicode Aliases) --- - {"\U0001F60A", smiling_eyes, smiling_eyes_width, smiling_eyes_height}, // ๐Ÿ˜Š Smiling Eyes - {"\U0001F600", grinning, grinning_width, grinning_height}, // ๐Ÿ˜€ Grinning Face - {"\U0001F603", grinning_big_eyes, grinning_big_eyes_width, grinning_big_eyes_height}, // ๐Ÿ˜ƒ Grinning Face with Big Eyes - {"\U0001F642", slightly_smiling, slightly_smiling_width, slightly_smiling_height}, // ๐Ÿ™‚ Slightly Smiling Face - {"\U0001F609", winking_face, winking_face_width, winking_face_height}, // ๐Ÿ˜‰ Winking Face - {"\U0001F601", grinning_smiling_eyes, grinning_smiling_eyes_width, grinning_smiling_eyes_height}, // ๐Ÿ˜ Grinning Smiling Eyes - {"\U0001F60D", heart_eyes, heart_eyes_width, heart_eyes_height}, // ๐Ÿ˜ Heart Eyes - {"\U0001F970", heart_smile, heart_smile_width, heart_smile_height}, // ๐Ÿฅฐ Smiling Face with Hearts - {"\U0001F976", cold_face, cold_face_width, cold_face_height}, // ๐Ÿฅถ Cold Face - {"\U0001F629", weary_face, weary_face_width, weary_face_height}, // ๐Ÿ˜ฉ Weary Face - {"\U0001F62E", open_mouth, open_mouth_width, open_mouth_height}, // ๐Ÿ˜ฎ Open Mouth + {"\U0001F60A", "smiling_eyes", smiling_eyes, smiling_eyes_width, smiling_eyes_height}, // ๐Ÿ˜Š Smiling Eyes + {"\U0001F600", "grinning", grinning, grinning_width, grinning_height}, // ๐Ÿ˜€ Grinning Face + {"\U0001F642", "slightly_smiling", slightly_smiling, slightly_smiling_width, slightly_smiling_height}, // ๐Ÿ™‚ Slightly Smiling Face + {"\U0001F609", "winking_face", winking_face, winking_face_width, winking_face_height}, // ๐Ÿ˜‰ Winking Face + {"\U0001F601", "grinning_smiling_eyes", grinning_smiling_eyes, grinning_smiling_eyes_width, grinning_smiling_eyes_height}, // ๐Ÿ˜ Grinning Smiling Eyes + {"\U0001F60D", "heart_eyes", heart_eyes, heart_eyes_width, heart_eyes_height}, // ๐Ÿ˜ Heart Eyes + {"\U0001F970", "heart_smile", heart_smile, heart_smile_width, heart_smile_height}, // ๐Ÿฅฐ Smiling Face with Hearts + {"\U0001F976", "cold_face", cold_face, cold_face_width, cold_face_height}, // ๐Ÿฅถ Cold Face + {"\U0001F629", "weary_face", weary_face, weary_face_width, weary_face_height}, // ๐Ÿ˜ฉ Weary Face + {"\U0001F62E", "open_mouth", open_mouth, open_mouth_width, open_mouth_height}, // ๐Ÿ˜ฎ Open Mouth // --- Question/Alert --- - {"\u2753", question, question_width, question_height}, // โ“ Question Mark - {"\u203C\uFE0F", bang, bang_width, bang_height}, // โ€ผ๏ธ Double Exclamation Mark - {"\u26A0\uFE0F", caution, caution_width, caution_height}, // โš ๏ธ Warning Sign - {"\U0001F4F6", antenna_bars, antenna_bars_width, antenna_bars_height}, // ๐Ÿ“ถ Antenna Bars + {"\u2753", "question", question, question_width, question_height}, // โ“ Question Mark + {"\u203C\uFE0F", "bang", bang, bang_width, bang_height}, // โ€ผ๏ธ Double Exclamation Mark + {"\u26A0\uFE0F", "caution", caution, caution_width, caution_height}, // โš ๏ธ Warning Sign + {"\U0001F4F6", "antenna_bars", antenna_bars, antenna_bars_width, antenna_bars_height}, // ๐Ÿ“ถ Antenna Bars // --- Laughing Faces --- - {"\U0001F602", haha, haha_width, haha_height}, // ๐Ÿ˜‚ Face with Tears of Joy - {"\U0001F923", rofl, rofl_width, rofl_height}, // ๐Ÿคฃ Rolling on the Floor Laughing - {"\U0001F606", smiling_closed_eyes, smiling_closed_eyes_width, smiling_closed_eyes_height}, // ๐Ÿ˜† Smiling Closed Eyes - {"\U0001F605", haha, haha_width, haha_height}, // ๐Ÿ˜… Smiling with Sweat - {"\U0001F604", grinning_smiling_eyes_2, grinning_smiling_eyes_2_width, - grinning_smiling_eyes_2_height}, // ๐Ÿ˜„ Grinning Face with Smiling Eyes - {"\U0001F62D", loudly_crying_face, loudly_crying_face_width, loudly_crying_face_height}, // ๐Ÿ˜ญ Loudly Crying Face - {"\U0001F92E", vomiting, vomiting_width, vomiting_height}, // ๐Ÿคฎ Face Vomiting - {"\U0001F60E", cool, cool_width, cool_height}, // ๐Ÿ˜Ž Smiling Face with Sunglasses - {"\U0001F634", sleeping_face, sleeping_face_width, sleeping_face_height}, // ๐Ÿ˜ด Sleeping Face - {"\U0001F440", eyes, eyes_width, eyes_height}, // ๐Ÿ‘€ Eyes - {"\U0001F441\uFE0F", eye, eye_width, eye_height}, // ๐Ÿ‘๏ธ Eye + {"\U0001F602", "haha", haha, haha_width, haha_height}, // ๐Ÿ˜‚ Face with Tears of Joy + {"\U0001F923", "rofl", rofl, rofl_width, rofl_height}, // ๐Ÿคฃ Rolling on the Floor Laughing + {"\U0001F606", "smiling_closed_eyes", smiling_closed_eyes, smiling_closed_eyes_width, smiling_closed_eyes_height}, // ๐Ÿ˜† Smiling Closed Eyes + {"\U0001F605", "haha", haha, haha_width, haha_height}, // ๐Ÿ˜… Smiling with Sweat + {"\U0001F604", "grinning_smiling_eyes", grinning_smiling_eyes_2, grinning_smiling_eyes_2_width, + grinning_smiling_eyes_2_height}, // ๐Ÿ˜„ Grinning Face with Smiling Eyes + {"\U0001F62D", "loudly_crying_face", loudly_crying_face, loudly_crying_face_width, loudly_crying_face_height}, // ๐Ÿ˜ญ Loudly Crying Face + {"\U0001F92E", "vomiting", vomiting, vomiting_width, vomiting_height}, // ๐Ÿคฎ Face Vomiting + {"\U0001F60E", "cool", cool, cool_width, cool_height}, // ๐Ÿ˜Ž Smiling Face with Sunglasses + {"\U0001F440", "eyes", eyes, eyes_width, eyes_height}, // ๐Ÿ‘€ Eyes + {"\U0001F441\uFE0F", "eye", eye, eye_width, eye_height}, // ๐Ÿ‘๏ธ Eye + {"\U0001F634", "sleeping_face", sleeping_face, sleeping_face_width, sleeping_face_height}, // ๐Ÿ˜ด Sleeping Face // --- Gestures and People --- - {"\U0001F44B", wave_icon, wave_icon_width, wave_icon_height}, // ๐Ÿ‘‹ Waving Hand - {"\u270C\uFE0F", peace_sign, peace_sign_width, peace_sign_height}, // โœŒ๏ธ Victory Hand - {"\U0001F596", vulcan_salute, vulcan_salute_width, vulcan_salute_height}, // ๐Ÿ–– Vulcan Salute - {"\U0001F64F", praying, praying_width, praying_height}, // ๐Ÿ™ Praying Hands - {"\U0001F64C", raising_hands, raising_hands_width, raising_hands_height}, // ๐Ÿ™Œ Raising Hands - {"\U0001F4AA", strong, strong_width, strong_height}, // ๐Ÿ’ช Flexed Biceps - {"\U0001F937", shrug, shrug_width, shrug_height}, // ๐Ÿคท Person Shrugging - {"\U0001F920", cowboy, cowboy_width, cowboy_height}, // ๐Ÿค  Cowboy Hat Face - {"\U0001F3A7", deadmau5, deadmau5_width, deadmau5_height}, // ๐ŸŽง Headphones + {"\U0001F44B", "wave", wave_icon, wave_icon_width, wave_icon_height}, // ๐Ÿ‘‹ Waving Hand + {"\u270C\uFE0F", "victory", peace_sign, peace_sign_width, peace_sign_height}, // โœŒ๏ธ Victory Hand + {"\U0001F596", "vulcan_salute", vulcan_salute, vulcan_salute_width, vulcan_salute_height}, // ๐Ÿ–– Vulcan Salute + {"\U0001F64F", "praying", praying, praying_width, praying_height}, // ๐Ÿ™ Praying Hands + {"\U0001F4AA", "strong", strong, strong_width, strong_height}, // ๐Ÿ’ช Flexed Biceps + {"\U0001F937", "shrug", shrug, shrug_width, shrug_height}, // ๐Ÿคท Person Shrugging + {"\U0001F920", "cowboy", cowboy, cowboy_width, cowboy_height}, // ๐Ÿค  Cowboy Hat Face + {"\U0001F3A7", "deadmau5", deadmau5, deadmau5_width, deadmau5_height}, // ๐ŸŽง Headphones // --- Symbols --- - {"\u2714\uFE0F", check_mark, check_mark_width, check_mark_height}, // โœ”๏ธ Check Mark - {"\u2705", check_mark, check_mark_width, check_mark_height}, // โœ… Check Mark Button - {"\u2611\uFE0F", check_mark, check_mark_width, check_mark_height}, // โ˜‘๏ธ Check Box with Check - {"\U0001F3E0", house, house_width, house_height}, // ๐Ÿ  House - {"\U0001F5FC", tower, tower_width, tower_height}, // ๐Ÿ—ผ Tokyo Tower - {"\U0001F4AF", one_hundred, one_hundred_width, one_hundred_height}, // ๐Ÿ’ฏ Hundred Points Symbol + {"\u2714\uFE0F", "check_mark", check_mark, check_mark_width, check_mark_height}, // โœ”๏ธ Check Mark + {"\u2705", "check_mark", check_mark, check_mark_width, check_mark_height}, // โœ… Check Mark Button + {"\u2611\uFE0F", "check_mark", check_mark, check_mark_width, check_mark_height}, // โ˜‘๏ธ Check Box with Check + {"\U0001F3E0", "house", house, house_width, house_height}, // ๐Ÿ  House + {"\U0001F5FC", "tower", tower, tower_width, tower_height}, // ๐Ÿ—ผ Tokyo Tower + {"\U0001F4AF", "one_hundred", one_hundred, one_hundred_width, one_hundred_height}, // ๐Ÿ’ฏ Hundred Points Symbol // --- Weather --- - {"\u2600", sun, sun_width, sun_height}, // โ˜€ Sun (without variation selector) - {"\u2600\uFE0F", sun, sun_width, sun_height}, // โ˜€๏ธ Sun (with variation selector) - {"\U0001F327", rain, rain_width, rain_height}, // ๐ŸŒง Cloud with Rain - {"\U0001F327\uFE0F", rain, rain_width, rain_height}, // ๐ŸŒง๏ธ Cloud with Rain - {"\u2601\uFE0F", cloud, cloud_width, cloud_height}, // โ˜๏ธ Cloud - {"\U0001F32B\uFE0F", fog, fog_width, fog_height}, // ๐ŸŒซ๏ธ Fog - {"\u2744\uFE0F", snowflake, snowflake_width, snowflake_height}, // โ„๏ธ Snowflake - {"\U0001F4A7", drop, drop_width, drop_height}, // ๐Ÿ’ง Droplet - {"\U0001F321\uFE0F", thermometer, thermometer_width, thermometer_height}, // ๐ŸŒก๏ธ Thermometer - {"\U0001F326\uFE0F", sun_behind_raincloud, sun_behind_raincloud_width, + {"\u2600", "sun", sun, sun_width, sun_height}, // โ˜€ Sun (without variation selector) + {"\u2600\uFE0F", "sun", sun, sun_width, sun_height}, // โ˜€๏ธ Sun (with variation selector) + {"\U0001F327\uFE0F", "rain", rain, rain_width, rain_height}, // ๐ŸŒง๏ธ Cloud with Rain + {"\u2601\uFE0F", "cloud", cloud, cloud_width, cloud_height}, // โ˜๏ธ Cloud + {"\U0001F32B\uFE0F", "fog", fog, fog_width, fog_height}, // ๐ŸŒซ๏ธ Fog + {"\u2744\uFE0F", "snowflake", snowflake, snowflake_width, snowflake_height}, // โ„๏ธ Snowflake + {"\U0001F4A7", "drop", drop, drop_width, drop_height}, // ๐Ÿ’ง Droplet + {"\U0001F321\uFE0F", "thermometer", thermometer, thermometer_width, thermometer_height}, // ๐ŸŒก๏ธ Thermometer + {"\U0001F326\uFE0F", "sun_behind_raincloud", sun_behind_raincloud, sun_behind_raincloud_width, sun_behind_raincloud_height}, // ๐ŸŒฆ๏ธ Sun Behind Rain Cloud - {"\u26C5", sun_behind_cloud, sun_behind_cloud_width, sun_behind_cloud_height}, // โ›… Sun Behind Cloud - {"\u26C5\uFE0F", sun_behind_cloud, sun_behind_cloud_width, sun_behind_cloud_height}, // โ›…๏ธ Sun Behind Cloud - {"\U0001F328\uFE0F", cloud_with_snow, cloud_with_snow_width, cloud_with_snow_height}, // ๐ŸŒจ๏ธ Cloud with Snow - {"\U0001F329\uFE0F", cloud_with_lightning, cloud_with_lightning_width, + {"\u26C5", "sun_behind_cloud", sun_behind_cloud, sun_behind_cloud_width, sun_behind_cloud_height}, // โ›… Sun Behind Cloud + {"\u26C5\uFE0F", "sun_behind_cloud", sun_behind_cloud, sun_behind_cloud_width, sun_behind_cloud_height}, // โ›…๏ธ Sun Behind Cloud + {"\U0001F328\uFE0F", "cloud_with_snow", cloud_with_snow, cloud_with_snow_width, cloud_with_snow_height}, // ๐ŸŒจ๏ธ Cloud with Snow + {"\U0001F329\uFE0F", "cloud_with_lightning", cloud_with_lightning, cloud_with_lightning_width, cloud_with_lightning_height}, // ๐ŸŒฉ๏ธ Cloud with Lightning - {"\u26C8", cloud_with_lightning_rain, cloud_with_lightning_rain_width, + {"\u26C8", "cloud_with_lightning_rain", cloud_with_lightning_rain, cloud_with_lightning_rain_width, cloud_with_lightning_rain_height}, // โ›ˆ Cloud with Lightning and Rain - {"\u26C8\uFE0F", cloud_with_lightning_rain, cloud_with_lightning_rain_width, + {"\u26C8\uFE0F", "cloud_with_lightning_rain", cloud_with_lightning_rain, cloud_with_lightning_rain_width, cloud_with_lightning_rain_height}, // โ›ˆ๏ธ Cloud with Lightning and Rain - {"\U0001F32C\uFE0F", wind_face, wind_face_width, wind_face_height}, // ๐ŸŒฌ๏ธ Wind Face - {"\U0001F305", sunrise, sunrise_width, sunrise_height}, // ๐ŸŒ… Sunrise - {"\U0001F304", sunrise, sunrise_width, sunrise_height}, // ๐ŸŒ„ Sunrise - {"\U0001F306", sunset, sunset_width, sunset_height}, // ๐ŸŒ† Sunset - {"\U0001F307", sunset, sunset_width, sunset_height}, // ๐ŸŒ‡ Sunset + {"\U0001F32C\uFE0F", "wind_face", wind_face, wind_face_width, wind_face_height}, // ๐ŸŒฌ๏ธ Wind Face + {"\U0001F305", "sunrise", sunrise, sunrise_width, sunrise_height}, // ๐ŸŒ… Sunrise + {"\U0001F304", "sunrise", sunrise, sunrise_width, sunrise_height}, // ๐ŸŒ„ Sunrise + {"\U0001F306", "sunset", sunset, sunset_width, sunset_height}, // ๐ŸŒ† Sunset + {"\U0001F307", "sunset", sunset, sunset_width, sunset_height}, // ๐ŸŒ‡ Sunset // --- Moon Phases --- - {"\U0001F311", new_moon, new_moon_width, new_moon_height}, // ๐ŸŒ‘ New Moon - {"\U0001F312", waxing_crescent_moon, waxing_crescent_moon_width, waxing_crescent_moon_height}, // ๐ŸŒ’ Waxing Crescent Moon - {"\U0001F313", first_quarter_moon, first_quarter_moon_width, first_quarter_moon_height}, // ๐ŸŒ“ First Quarter Moon - {"\U0001F314", waxing_gibbous_moon, waxing_gibbous_moon_width, waxing_gibbous_moon_height}, // ๐ŸŒ” Waxing Gibbous Moon - {"\U0001F315", full_moon, full_moon_width, full_moon_height}, // ๐ŸŒ• Full Moon - {"\U0001F316", waning_gibbous_moon, waning_gibbous_moon_width, waning_gibbous_moon_height}, // ๐ŸŒ– Waning Gibbous Moon - {"\U0001F317", last_quarter_moon, last_quarter_moon_width, last_quarter_moon_height}, // ๐ŸŒ— Last Quarter Moon - {"\U0001F318", waning_crescent_moon, waning_crescent_moon_width, waning_crescent_moon_height}, // ๐ŸŒ˜ Waning Crescent Moon - {"\U0001F31B", first_quarter_moon_face, first_quarter_moon_face_width, + {"\U0001F311", "new_moon", new_moon, new_moon_width, new_moon_height}, // ๐ŸŒ‘ New Moon + {"\U0001F312", "waxing_crescent_moon", waxing_crescent_moon, waxing_crescent_moon_width, waxing_crescent_moon_height}, // ๐ŸŒ’ Waxing Crescent Moon + {"\U0001F313", "first_quarter_moon", first_quarter_moon, first_quarter_moon_width, first_quarter_moon_height}, // ๐ŸŒ“ First Quarter Moon + {"\U0001F314", "waxing_gibbous_moon", waxing_gibbous_moon, waxing_gibbous_moon_width, waxing_gibbous_moon_height}, // ๐ŸŒ” Waxing Gibbous Moon + {"\U0001F315", "full_moon", full_moon, full_moon_width, full_moon_height}, // ๐ŸŒ• Full Moon + {"\U0001F316", "waning_gibbous_moon", waning_gibbous_moon, waning_gibbous_moon_width, waning_gibbous_moon_height}, // ๐ŸŒ– Waning Gibbous Moon + {"\U0001F317", "last_quarter_moon", last_quarter_moon, last_quarter_moon_width, last_quarter_moon_height}, // ๐ŸŒ— Last Quarter Moon + {"\U0001F318", "waning_crescent_moon", waning_crescent_moon, waning_crescent_moon_width, waning_crescent_moon_height}, // ๐ŸŒ˜ Waning Crescent Moon + {"\U0001F31B", "first_quarter_moon", first_quarter_moon_face, first_quarter_moon_face_width, first_quarter_moon_face_height}, // ๐ŸŒ› First Quarter Moon Face // --- Misc Faces --- - {"\U0001F608", devil, devil_width, devil_height}, // ๐Ÿ˜ˆ Smiling Face with Horns - {"\U0001F921", clown, clown_width, clown_height}, // ๐Ÿคก Clown Face - {"\U0001F916", robo, robo_width, robo_height}, // ๐Ÿค– Robot Face - {"\U0001F479", ogre, ogre_width, ogre_height}, // ๐Ÿ‘น Ogre + {"\U0001F608", "devil", devil, devil_width, devil_height}, // ๐Ÿ˜ˆ Smiling Face with Horns + {"\U0001F921", "clown", clown, clown_width, clown_height}, // ๐Ÿคก Clown Face + {"\U0001F916", "robot", robo, robo_width, robo_height}, // ๐Ÿค– Robot Face + {"\U0001F479", "ogre", ogre, ogre_width, ogre_height}, // ๐Ÿ‘น Ogre // --- Hearts (Multiple Unicode Aliases) --- - {"\u2665", heart, heart_width, heart_height}, // โ™ฅ Black Heart Suit - {"\u2665\uFE0F", heart, heart_width, heart_height}, // โ™ฅ๏ธ Black Heart Suit (emoji presentation) - {"\u2764\uFE0F", heart, heart_width, heart_height}, // โค๏ธ Red Heart - {"\U0001F9E1", heart, heart_width, heart_height}, // ๐Ÿงก Orange Heart - {"\U00002763", heart, heart_width, heart_height}, // โฃ Heart Exclamation - {"\U00002764", heart, heart_width, heart_height}, // โค Red Heart (legacy) - {"\U0001F495", heart, heart_width, heart_height}, // ๐Ÿ’• Two Hearts - {"\U0001F496", heart, heart_width, heart_height}, // ๐Ÿ’– Sparkling Heart - {"\U0001F497", heart, heart_width, heart_height}, // ๐Ÿ’— Growing Heart - {"\U0001F498", heart, heart_width, heart_height}, // ๐Ÿ’˜ Heart with Arrow + {"\u2665", "heart", heart, heart_width, heart_height}, // โ™ฅ Black Heart Suit + {"\u2665\uFE0F", "heart", heart, heart_width, heart_height}, // โ™ฅ๏ธ Black Heart Suit (emoji presentation) + {"\u2764\uFE0F", "heart", heart, heart_width, heart_height}, // โค๏ธ Red Heart + {"\U0001F9E1", "heart", heart, heart_width, heart_height}, // ๐Ÿงก Orange Heart + {"\U00002763", "heart", heart, heart_width, heart_height}, // โฃ Heart Exclamation + {"\U00002764", "heart", heart, heart_width, heart_height}, // โค Red Heart (legacy) + {"\U0001F495", "heart", heart, heart_width, heart_height}, // ๐Ÿ’• Two Hearts + {"\U0001F496", "heart", heart, heart_width, heart_height}, // ๐Ÿ’– Sparkling Heart + {"\U0001F497", "heart", heart, heart_width, heart_height}, // ๐Ÿ’— Growing Heart + {"\U0001F498", "heart", heart, heart_width, heart_height}, // ๐Ÿ’˜ Heart with Arrow // --- Objects --- - {"\U0001F4A9", poo, poo_width, poo_height}, // ๐Ÿ’ฉ Pile of Poo - {"\U0001F514", bell_icon, bell_icon_width, bell_icon_height}, // ๐Ÿ”” Bell - {"\U0001F4CB", clipboard, clipboard_width, clipboard_height}, // ๐Ÿ“‹ Clipboard - {"\U0001F36A", cookie, cookie_width, cookie_height}, // ๐Ÿช Cookie - {"\U0001F370", shortcake, shortcake_width, shortcake_height}, // ๐Ÿฐ Shortcake - {"\U0001F351", peach, peach_width, peach_height}, // ๐Ÿ‘ Peach - {"\U0001F983", turkey, turkey_width, turkey_height}, // ๐Ÿฆƒ Turkey - {"\U0001F357", turkey_leg, turkey_leg_width, turkey_leg_height}, // ๐Ÿ— Poultry Leg - {"\U0001F525", fire, fire_width, fire_height}, // ๐Ÿ”ฅ Fire - {"\u2728", sparkles, sparkles_width, sparkles_height}, // โœจ Sparkles - {"\U0001F573\uFE0F", hole, hole_width, hole_height}, // ๐Ÿ•ณ๏ธ Hole - {"\U0001F3B3", bowling, bowling_width, bowling_height}, // ๐ŸŽณ Bowling - {"\u2615", hot_beverage, hot_beverage_width, hot_beverage_height}, // โ˜• Hot Beverage - {"\U0001F37A", beer, beer_width, beer_height}, - {"\U0001F954", potato, potato_width, potato_height}, // ๐Ÿฅ” Potato - {"\U0001FAB5", wood, wood_width, wood_height}, // ๐Ÿชต Wood + {"\U0001F4A9", "poo", poo, poo_width, poo_height}, // ๐Ÿ’ฉ Pile of Poo + {"\U0001F514", "bell_icon", bell_icon, bell_icon_width, bell_icon_height}, // ๐Ÿ”” Bell + {"\U0001F4CB", "clipboard", clipboard, clipboard_width, clipboard_height}, // ๐Ÿ“‹ Clipboard + {"\U0001F36A", "cookie", cookie, cookie_width, cookie_height}, // ๐Ÿช Cookie + {"\U0001F370", "shortcake", shortcake, shortcake_width, shortcake_height}, // ๐Ÿฐ Shortcake + {"\U0001F351", "peach", peach, peach_width, peach_height}, // ๐Ÿ‘ Peach + {"\U0001F983", "turkey", turkey, turkey_width, turkey_height}, // ๐Ÿฆƒ Turkey + {"\U0001F357", "turkey_leg", turkey_leg, turkey_leg_width, turkey_leg_height}, // ๐Ÿ— Poultry Leg + {"\U0001F525", "fire", fire, fire_width, fire_height}, // ๐Ÿ”ฅ Fire + {"\u2728", "sparkles", sparkles, sparkles_width, sparkles_height}, // โœจ Sparkles + {"\U0001F573\uFE0F", "hole", hole, hole_width, hole_height}, // ๐Ÿ•ณ๏ธ Hole + {"\U0001F3B3", "bowling", bowling, bowling_width, bowling_height}, // ๐ŸŽณ Bowling + {"\u2615", "hot_beverage", hot_beverage, hot_beverage_width, hot_beverage_height}, // โ˜• Hot Beverage + {"\U0001F37A", "beer", beer, beer_width, beer_height}, + {"\U0001F954", "potato", potato, potato_width, potato_height}, // ๐Ÿฅ” Potato + {"\U0001FAB5", "wood", wood, wood_width, wood_height}, // ๐Ÿชต Wood // --- Arrows --- - {"\u2193", downwards_arrow, downwards_arrow_width, downwards_arrow_height}, // โ†“ Downwards Arrow - {"\u2193\uFE0E", downwards_arrow, downwards_arrow_width, downwards_arrow_height}, // โ†“๏ธŽ Downwards Arrow (text) - {"\u2193\uFE0F", downwards_arrow, downwards_arrow_width, downwards_arrow_height}, // โ†“๏ธ Downwards Arrow (emoji) - {"\u2B07\uFE0F", downwards_arrow, downwards_arrow_width, downwards_arrow_height}, // โฌ‡๏ธ Downwards Heavy Arrow (emoji) - {"\u2B07", downwards_arrow, downwards_arrow_width, downwards_arrow_height}, // โฌ‡ Downwards Heavy Arrow (text) - {"\u2199", south_west_arrow, south_west_arrow_width, south_west_arrow_height}, // โ†™ South West Arrow - {"\u2199\uFE0E", south_west_arrow, south_west_arrow_width, south_west_arrow_height}, // โ†™๏ธŽ South West Arrow (text) - {"\u2199\uFE0F", south_west_arrow, south_west_arrow_width, south_west_arrow_height}, // โ†™๏ธ South West Arrow (emoji) - {"\u2190", leftwards_arrow, leftwards_arrow_width, leftwards_arrow_height}, // โ† Leftwards Arrow - {"\u2190\uFE0E", leftwards_arrow, leftwards_arrow_width, leftwards_arrow_height}, // โ†๏ธŽ Leftwards Arrow (text) - {"\u2190\uFE0F", leftwards_arrow, leftwards_arrow_width, leftwards_arrow_height}, // โ†๏ธ Leftwards Arrow (emoji) - {"\u2B05\uFE0F", leftwards_arrow, leftwards_arrow_width, leftwards_arrow_height}, // โฌ…๏ธ Leftwards Heavy Arrow (emoji) - {"\u2B05", leftwards_arrow, leftwards_arrow_width, leftwards_arrow_height}, // โฌ… Leftwards Heavy Arrow (text) - {"\u2196", north_west_arrow, north_west_arrow_width, north_west_arrow_height}, // โ†– North West Arrow - {"\u2196\uFE0E", north_west_arrow, north_west_arrow_width, north_west_arrow_height}, // โ†–๏ธŽ North West Arrow (text) - {"\u2196\uFE0F", north_west_arrow, north_west_arrow_width, north_west_arrow_height}, // โ†–๏ธ North West Arrow (emoji) - {"\u2191", upwards_arrow, upwards_arrow_width, upwards_arrow_height}, // โ†‘ Upwards Arrow - {"\u2191\uFE0E", upwards_arrow, upwards_arrow_width, upwards_arrow_height}, // โ†‘๏ธŽ Upwards Arrow (text) - {"\u2191\uFE0F", upwards_arrow, upwards_arrow_width, upwards_arrow_height}, // โ†‘๏ธ Upwards Arrow (emoji) - {"\u2B06\uFE0F", upwards_arrow, upwards_arrow_width, upwards_arrow_height}, // โฌ†๏ธ Upwards Heavy Arrow (emoji) - {"\u2B06", upwards_arrow, upwards_arrow_width, upwards_arrow_height}, // โฌ† Upwards Heavy Arrow (text) - {"\u2197", north_east_arrow, north_east_arrow_width, north_east_arrow_height}, // โ†— North East Arrow - {"\u2197\uFE0E", north_east_arrow, north_east_arrow_width, north_east_arrow_height}, // โ†—๏ธŽ North East Arrow (text) - {"\u2197\uFE0F", north_east_arrow, north_east_arrow_width, north_east_arrow_height}, // โ†—๏ธ North East Arrow (emoji) - {"\u2192", rightwards_arrow, rightwards_arrow_width, rightwards_arrow_height}, // โ†’ Rightwards Arrow - {"\u2192\uFE0E", rightwards_arrow, rightwards_arrow_width, rightwards_arrow_height}, // โ†’๏ธŽ Rightwards Arrow (text) - {"\u2192\uFE0F", rightwards_arrow, rightwards_arrow_width, rightwards_arrow_height}, // โ†’๏ธ Rightwards Arrow (emoji) - {"\u27A1\uFE0F", rightwards_arrow, rightwards_arrow_width, rightwards_arrow_height}, // โžก๏ธ Rightwards Heavy Arrow (emoji) - {"\u27A1", rightwards_arrow, rightwards_arrow_width, rightwards_arrow_height}, // โžก Rightwards Heavy Arrow (text) - {"\u2198", south_east_arrow, south_east_arrow_width, south_east_arrow_height}, // โ†˜ South East Arrow - {"\u2198\uFE0E", south_east_arrow, south_east_arrow_width, south_east_arrow_height}, // โ†˜๏ธŽ South East Arrow (text) - {"\u2198\uFE0F", south_east_arrow, south_east_arrow_width, south_east_arrow_height}, // โ†˜๏ธ South East Arrow (emoji) + {"\u2193", "downwards_arrow", downwards_arrow, downwards_arrow_width, downwards_arrow_height}, // โ†“ Downwards Arrow + {"\u2193\uFE0E", "downwards_arrow", downwards_arrow, downwards_arrow_width, downwards_arrow_height}, // โ†“๏ธŽ Downwards Arrow (text) + {"\u2193\uFE0F", "downwards_arrow", downwards_arrow, downwards_arrow_width, downwards_arrow_height}, // โ†“๏ธ Downwards Arrow (emoji) + {"\u2199", "south_west_arrow", south_west_arrow, south_west_arrow_width, south_west_arrow_height}, // โ†™ South West Arrow + {"\u2199\uFE0E", "south_west_arrow", south_west_arrow, south_west_arrow_width, south_west_arrow_height}, // โ†™๏ธŽ South West Arrow (text) + {"\u2199\uFE0F", "south_west_arrow", south_west_arrow, south_west_arrow_width, south_west_arrow_height}, // โ†™๏ธ South West Arrow (emoji) + {"\u2190", "leftwards_arrow", leftwards_arrow, leftwards_arrow_width, leftwards_arrow_height}, // โ† Leftwards Arrow + {"\u2190\uFE0E", "leftwards_arrow", leftwards_arrow, leftwards_arrow_width, leftwards_arrow_height}, // โ†๏ธŽ Leftwards Arrow (text) + {"\u2190\uFE0F", "leftwards_arrow", leftwards_arrow, leftwards_arrow_width, leftwards_arrow_height}, // โ†๏ธ Leftwards Arrow (emoji) + {"\u2196", "north_west_arrow", north_west_arrow, north_west_arrow_width, north_west_arrow_height}, // โ†– North West Arrow + {"\u2196\uFE0E", "north_west_arrow", north_west_arrow, north_west_arrow_width, north_west_arrow_height}, // โ†–๏ธŽ North West Arrow (text) + {"\u2196\uFE0F", "north_west_arrow", north_west_arrow, north_west_arrow_width, north_west_arrow_height}, // โ†–๏ธ North West Arrow (emoji) + {"\u2191", "upwards_arrow", upwards_arrow, upwards_arrow_width, upwards_arrow_height}, // โ†‘ Upwards Arrow + {"\u2191\uFE0E", "upwards_arrow", upwards_arrow, upwards_arrow_width, upwards_arrow_height}, // โ†‘๏ธŽ Upwards Arrow (text) + {"\u2191\uFE0F", "upwards_arrow", upwards_arrow, upwards_arrow_width, upwards_arrow_height}, // โ†‘๏ธ Upwards Arrow (emoji) + {"\u2197", "north_east_arrow", north_east_arrow, north_east_arrow_width, north_east_arrow_height}, // โ†— North East Arrow + {"\u2197\uFE0E", "north_east_arrow", north_east_arrow, north_east_arrow_width, north_east_arrow_height}, // โ†—๏ธŽ North East Arrow (text) + {"\u2197\uFE0F", "north_east_arrow", north_east_arrow, north_east_arrow_width, north_east_arrow_height}, // โ†—๏ธ North East Arrow (emoji) + {"\u2192", "rightwards_arrow", rightwards_arrow, rightwards_arrow_width, rightwards_arrow_height}, // โ†’ Rightwards Arrow + {"\u2192\uFE0E", "rightwards_arrow", rightwards_arrow, rightwards_arrow_width, rightwards_arrow_height}, // โ†’๏ธŽ Rightwards Arrow (text) + {"\u2192\uFE0F", "rightwards_arrow", rightwards_arrow, rightwards_arrow_width, rightwards_arrow_height}, // โ†’๏ธ Rightwards Arrow (emoji) + {"\u2198", "south_east_arrow", south_east_arrow, south_east_arrow_width, south_east_arrow_height}, // โ†˜ South East Arrow + {"\u2198\uFE0E", "south_east_arrow", south_east_arrow, south_east_arrow_width, south_east_arrow_height}, // โ†˜๏ธŽ South East Arrow (text) + {"\u2198\uFE0F", "south_east_arrow", south_east_arrow, south_east_arrow_width, south_east_arrow_height}, // โ†˜๏ธ South East Arrow (emoji) // --- Halloween --- - {"\U0001F383", jack_o_lantern, jack_o_lantern_width, jack_o_lantern_height}, // ๐ŸŽƒ Jack-O-Lantern - {"\U0001F47B", ghost, ghost_width, ghost_height}, // ๐Ÿ‘ป Ghost - {"\U0001F480", skull, skull_width, skull_height}, // ๐Ÿ’€ Skull + {"\U0001F383", "jack_o_lantern", jack_o_lantern, jack_o_lantern_width, jack_o_lantern_height}, // ๐ŸŽƒ Jack-O-Lantern + {"\U0001F47B", "ghost", ghost, ghost_width, ghost_height}, // ๐Ÿ‘ป Ghost + {"\U0001F480", "skull", skull, skull_width, skull_height}, // ๐Ÿ’€ Skull // --- Holidays --- - {"\U0001F384", christmas_tree, christmas_tree_width, christmas_tree_height}, // ๐ŸŽ„ Christmas Tree - {"\U0001F381", wrapped_gift, wrapped_gift_width, wrapped_gift_height}, // ๐ŸŽ Wrapped Gift - {"\U0001F54E", menorah, menorah_width, menorah_height}, // ๐Ÿ•Ž Menorah - {"\u271D\uFE0F", latin_cross, latin_cross_width, latin_cross_height}, // โœ๏ธ Latin Cross - {"\u2721\uFE0F", star_of_david, star_of_david_width, star_of_david_height}, // โœก๏ธ Star of David - {"\u26C4", snow_man, snow_man_width, snow_man_height}, // โ›„ Snowman - {"\u2603\uFE0F", snow_man, snow_man_width, snow_man_height}, // โ˜ƒ๏ธ Snowman + {"\U0001F384", "christmas_tree", christmas_tree, christmas_tree_width, christmas_tree_height}, // ๐ŸŽ„ Christmas Tree + {"\U0001F381", "wrapped_gift", wrapped_gift, wrapped_gift_width, wrapped_gift_height}, // ๐ŸŽ Wrapped Gift + {"\U0001F54E", "menorah", menorah, menorah_width, menorah_height}, // ๐Ÿ•Ž Menorah + {"\u271D\uFE0F", "latin_cross", latin_cross, latin_cross_width, latin_cross_height}, // โœ๏ธ Latin Cross + {"\u2721\uFE0F", "star_of_david", star_of_david, star_of_david_width, star_of_david_height}, // โœก๏ธ Star of David + {"\u26C4", "snow_man", snow_man, snow_man_width, snow_man_height}, // โ›„ Snowman + {"\u2603\uFE0F", "snow_man", snow_man, snow_man_width, snow_man_height}, // โ˜ƒ๏ธ Snowman // --- Misc --- - {"\U0001F4A8", dashing_away, dashing_away_width, dashing_away_height}, // ๐Ÿ’จ Dashing Away - {"\U0001F4CD", pushpin, pushpin_width, pushpin_height} // ๐Ÿ“ Pushpin + {"\U0001F4A8", "dashing_away", dashing_away, dashing_away_width, dashing_away_height}, // ๐Ÿ’จ Dashing Away + {"\U0001F4CD", "pushpin", pushpin, pushpin_width, pushpin_height} // ๐Ÿ“ Pushpin #endif }; diff --git a/src/graphics/emotes.h b/src/graphics/emotes.h index cb00f5d0e..7f99ea702 100644 --- a/src/graphics/emotes.h +++ b/src/graphics/emotes.h @@ -7,6 +7,7 @@ namespace graphics // === Emote List === struct Emote { const char *label; + const char * name; const unsigned char *bitmap; int width; int height; diff --git a/src/modules/SerialModule.cpp b/src/modules/SerialModule.cpp index 00686bfae..e4771bb21 100644 --- a/src/modules/SerialModule.cpp +++ b/src/modules/SerialModule.cpp @@ -7,6 +7,8 @@ #include "configuration.h" #include "gps/RTC.h" #include "meshUtils.h" +#include "graphics/EmoteRenderer.h" +#include "graphics/emotes.h" #include #include @@ -110,7 +112,7 @@ SerialModule::SerialModule() : StreamAPI(&SERIAL_PRINT_OBJECT), concurrency::OST static Print *serialPrint = &SERIAL_PRINT_OBJECT; char serialBytes[512]; -size_t serialPayloadSize; +size_t serialPayloadSize = 0; SerialModuleRadio::SerialModuleRadio() : SinglePortModule("SerialModuleRadio", meshtastic_PortNum_SERIAL_APP) { @@ -291,8 +293,15 @@ int32_t SerialModule::runOnce() #else HardwareSerial *serialInstance = &Serial1; #endif - while (serialInstance->available()) { - serialPayloadSize = serialInstance->readBytes(serialBytes, meshtastic_Constants_DATA_PAYLOAD_LEN); + while (serialInstance->available()) { // wait for CR and collect bytes, then send + size_t newSerialPayloadSize = serialInstance->readBytes( + &serialBytes[serialPayloadSize], + meshtastic_Constants_DATA_PAYLOAD_LEN - serialPayloadSize); + serialPayloadSize += newSerialPayloadSize; + // Echo new text back + for (int i=serialPayloadSize - newSerialPayloadSize; iprintf("%c", serialBytes[i]); + } #endif serialModuleRadio->sendPayload(); } @@ -341,10 +350,36 @@ void SerialModule::sendTelemetry(meshtastic_Telemetry m) */ void SerialModuleRadio::sendPayload(NodeNum dest, bool wantReplies) { + if ( + serialPayloadSize > 0 && + serialBytes[serialPayloadSize - 1] != '\n' && + serialPayloadSize != meshtastic_Constants_DATA_PAYLOAD_LEN) { + return; + } const meshtastic_Channel *ch = (boundChannel != NULL) ? &channels.getByName(boundChannel) : NULL; meshtastic_MeshPacket *p = allocDataPacket(); if (!p) return; + int string_start = 0; + if (serialBytes[0] == '@') { + // If the first word is a known short name, send the message there + char short_name[5]; + short_name[4]=0; + for (size_t i=0; i<4; i++) { + short_name[i] = serialBytes[i+1]; + if (i>serialPayloadSize || serialBytes[i+2] == ' ' || serialBytes[i+2] == '\n') { + short_name[i+1] = 0; + string_start = std::min(i+3, serialPayloadSize - 1); + break; + } + } + // Search in NodeDB + for (int i = 0; i < nodeDB->numMeshNodes; i++) { + if (!strncmp(nodeDB->meshNodes->at(i).short_name, short_name, 5)) { + dest = nodeDB->meshNodes->at(i).num; + } + } + } p->to = dest; if (ch != NULL) { p->channel = ch->index; @@ -353,10 +388,12 @@ void SerialModuleRadio::sendPayload(NodeNum dest, bool wantReplies) p->want_ack = ACK; - p->decoded.payload.size = serialPayloadSize; // You must specify how many bytes are in the reply - memcpy(p->decoded.payload.bytes, serialBytes, p->decoded.payload.size); + p->decoded.payload.size = serialPayloadSize - 2 - string_start; // Leave out the last CR/LF + memcpy(p->decoded.payload.bytes, &serialBytes[string_start], p->decoded.payload.size); service->sendToMesh(p); + // reset counter + serialPayloadSize = 0; } /** @@ -401,9 +438,25 @@ ProcessMessage SerialModuleRadio::handleReceived(const meshtastic_MeshPacket &mp serialPrint->write(p.payload.bytes, p.payload.size); } else if (moduleConfig.serial.mode == meshtastic_ModuleConfig_SerialConfig_Serial_Mode_TEXTMSG) { meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(getFrom(&mp)); - const char *sender = nodeInfoLiteHasUser(node) ? node->short_name : "???"; - serialPrint->println(); - serialPrint->printf("%s: %.*s", sender, (int)p.payload.size, p.payload.bytes); + if(strlen(node->long_name) > 0) { + serialPrint->printf("%s (%s): ", node->long_name, node->short_name); + } + for(int i=0; i0 && p.payload.bytes[i] == '\n' && p.payload.bytes[i-1] != '\r')) { + serialPrint->printf("\r"); + } + size_t matchLen = 0; + const graphics::Emote *matched = graphics::EmoteRenderer::findEmoteAt( + (const char*)(p.payload.bytes), + p.payload.size, i, matchLen); + if (matched) { + serialPrint->printf(":%s:", matched->name); + i += matchLen; + } else { + serialPrint->printf("%c", p.payload.bytes[i++]); + } + } serialPrint->println(); } else if ((moduleConfig.serial.mode == meshtastic_ModuleConfig_SerialConfig_Serial_Mode_NMEA || moduleConfig.serial.mode == meshtastic_ModuleConfig_SerialConfig_Serial_Mode_CALTOPO) &&