I'm bad at syncing branches #31
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Mapeadas flechas del teclado y añadida pulsacion del gatillo en modo serie -Se han mapeado las flechas del teclado y se han asignado al Dpad mientras la pistola está en modo Ratón+Teclado -Se ha añadido el botón "trigger" en modo mando mientras está activa la comunicación serie (mamehook) ya que anteriormente si se activaba la comunicación serie mientras la pistola estaba en modo "mando" dejaba de funcionar el gatillo * Algunas correcciones de como se muestra la vida (barra de vida) en la pantalla oled -Ahora calcula el porcentaje de "vida" y lo muestra correctamente. -Cambiado el tipo de variable usada para leer la "vida" de uint8_t cuyo valor máximo es 255 a uint16_t para mostrar correctamente la "vida en juegos que usen un valor mayor como Aliens Armageddon que usa de valor máximo 1000 * Reset SamcoEnhanced.ino Reset file to begin PR * Fix trigger in Gamepad mode + Serial -Added trigger button to work when serial comunication is enabled and gun is in Gamepad mode * Fix for life% shown in lifebar - Fix for life% shown in lifebar - Changed "serialLifeCount" from uint8_t to uint16_t, for handle life values higher than 255 * Translated some variable to maintain language consistency - Translated some variable to maintain language consistency
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.