remove all PS3 things and begin with ControllPad

This commit is contained in:
2023-03-30 22:20:28 +02:00
parent e4cdc5f98d
commit 33fe6916ed
16 changed files with 182 additions and 150 deletions
@@ -11,10 +11,9 @@
#include "menuSysteminformation.h"
MenuSysteminformation::MenuSysteminformation(Battery* mainBattery, Ps3Controller* gamepad)
MenuSysteminformation::MenuSysteminformation(Battery* mainBattery)
: MenuInformationSites(5) {
this->mainBattery = mainBattery;
this->gamepad = gamepad;
}
void MenuSysteminformation::printPage() const {
@@ -44,11 +43,11 @@ void MenuSysteminformation::printPage() const {
lineTwo.concat(this->mainBattery->getBatteryVoltage());
break;
case 4:
lineOne = "PS3 battery";
lineTwo = "is ";
lineTwo.concat(MenuSysteminformation::ps3ToString(this->gamepad->data.status.battery));
break;
// case 4:
// lineOne = "PS3 battery";
// lineTwo = "is ";
// lineTwo.concat(MenuSysteminformation::ps3ToString(this->gamepad->data.status.battery));
// break;
default:
this->printDefault();
@@ -58,12 +57,3 @@ void MenuSysteminformation::printPage() const {
this->print(lineOne, lineTwo);
}
String MenuSysteminformation::ps3ToString(uint8_t battery) {
if( battery == ps3_status_battery_charging ) return "LOAD";
else if( battery == ps3_status_battery_full ) return "FULL";
else if( battery == ps3_status_battery_high ) return "HIGH";
else if( battery == ps3_status_battery_low) return "LOW";
else if( battery == ps3_status_battery_dying ) return "BAD";
else if( battery == ps3_status_battery_shutdown ) return "OFF";
else return "UNDEF";
}
@@ -13,8 +13,8 @@
#define MENU_SYSTEMINFORMATION_H
#include <Arduino.h>
#include <Ps3Controller.h>
#include "controllPadInput.h"
#include "menuInformationSites.h"
#include "battery.h"
@@ -31,14 +31,12 @@ class MenuSysteminformation : public MenuInformationSites {
* @param mainBattery
* @param gamepad
*/
MenuSysteminformation(Battery* mainBattery, Ps3Controller* gamepad);
MenuSysteminformation(Battery* mainBattery);
private:
void printPage() const override;
static String ps3ToString(uint8_t battery);
Battery* mainBattery;
Ps3Controller* gamepad;
};
#endif // MENU_SYSTEMINFORMATION_H