O1.18 Merge

This commit is contained in:
Quentin Guidée
2019-12-28 14:45:48 +01:00
145 changed files with 5120 additions and 994 deletions

View File

@@ -1,8 +1,12 @@
#include "about_controller.h"
#include "../../../python/src/py/mpconfig.h"
#include <assert.h>
#include <cmath>
#include <apps/settings/main_controller.h>
#define MP_STRINGIFY_HELPER(x) #x
#define MP_STRINGIFY(x) MP_STRINGIFY_HELPER(x)
namespace Settings {
AboutController::AboutController(Responder * parentResponder) :
@@ -93,12 +97,14 @@ void AboutController::willDisplayCellForIndex(HighlightCell * cell, int index) {
}
else {
MessageTableCellWithBuffer * myCell = (MessageTableCellWithBuffer *)cell;
static const char * mpVersion = MICROPY_VERSION_STRING;
static const char * messages[] = {
#ifdef USERNAME
Ion::username(),
#endif
Ion::softwareVersion(),
Ion::customSoftwareVersion(),
mpVersion,
Ion::serialNumber(),
Ion::fccId()
};