Merge pull request #185 from Rotzbua/fix_some_types

squix78 · web-flow · commit f8a4ff22363b · 2018-03-18T07:52:56.000+01:00
fix integer types
diff --git a/OLEDDisplayUi.cpp b/OLEDDisplayUi.cpp
@@ -61,10 +61,10 @@ void OLEDDisplayUi::setAutoTransitionBackwards(){
   this->lastTransitionDirection = -1;
 }
 void OLEDDisplayUi::setTimePerFrame(uint16_t time){
-  this->ticksPerFrame = (int) ( (float) time / (float) updateInterval);
+  this->ticksPerFrame = (uint16_t) ( (float) time / (float) updateInterval);
 }
 void OLEDDisplayUi::setTimePerTransition(uint16_t time){
-  this->ticksPerTransition = (int) ( (float) time / (float) updateInterval);
+  this->ticksPerTransition = (uint16_t) ( (float) time / (float) updateInterval);
 }
 
 // -/------ Customize indicator position and style -------\-
@@ -190,7 +190,7 @@ OLEDDisplayUiState* OLEDDisplayUi::getUiState(){
 
 
 int8_t OLEDDisplayUi::update(){
-  long frameStart = millis();
+  unsigned long frameStart = millis();
   int8_t timeBudget = this->updateInterval - (frameStart - this->state.lastUpdate);
   if ( timeBudget <= 0) {
     // Implement frame skipping to ensure time budget is keept

Original file line number	Diff line number	Diff line change
`@@ -61,10 +61,10 @@ void OLEDDisplayUi::setAutoTransitionBackwards(){`
`61`	`61`	`this->lastTransitionDirection = -1;`
`62`	`62`	`}`
`63`	`63`	`void OLEDDisplayUi::setTimePerFrame(uint16_t time){`
`64`		`- this->ticksPerFrame = (int) ( (float) time / (float) updateInterval);`
	`64`	`+ this->ticksPerFrame = (uint16_t) ( (float) time / (float) updateInterval);`
`65`	`65`	`}`
`66`	`66`	`void OLEDDisplayUi::setTimePerTransition(uint16_t time){`
`67`		`- this->ticksPerTransition = (int) ( (float) time / (float) updateInterval);`
	`67`	`+ this->ticksPerTransition = (uint16_t) ( (float) time / (float) updateInterval);`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`// -/------ Customize indicator position and style -------\-`
`@@ -190,7 +190,7 @@ OLEDDisplayUiState* OLEDDisplayUi::getUiState(){`
`190`	`190`
`191`	`191`
`192`	`192`	`int8_t OLEDDisplayUi::update(){`
`193`		`- long frameStart = millis();`
	`193`	`+ unsigned long frameStart = millis();`
`194`	`194`	`int8_t timeBudget = this->updateInterval - (frameStart - this->state.lastUpdate);`
`195`	`195`	`if ( timeBudget <= 0) {`
`196`	`196`	`// Implement frame skipping to ensure time budget is keept`