Skip to content

Commit a0d41b6

Browse files
author
NachtRaveVL
committed
Working out some various build issues on other platforms
1 parent bff03b9 commit a0d41b6

File tree

6 files changed

+25
-23
lines changed

6 files changed

+25
-23
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ Recommended: 512kB-1MB+ Flash, 24-32kB+ SRAM, 32-48MHz+
6262

6363
* Definitely ___will___ work: GIGA, Portenta (any), ESP32/8266, Teensy 3.5+, STM32 (>256kB), Pico/RP2040 (any)
6464

65-
* _Can_ work /w ext. data/limited UI/small setup: Uno R4, Nano 33 (any), MKR (any), Due/Zero, Teensy 3.2, STM32 (256kB)
65+
* _Can_ work /w external data/minimal UI: Uno R4, Nano 33 (any), MKR (any), Due/Zero, STM32 (256kB)
6666

67-
* _May_ work, but only with heavy tweaking/limited build: ATMega2560, Genuino 101
67+
* _May_ work, but only with heavy tweaking/limited build: ATMega2560, Genuino 101, Teensy 3.2 (/3.1), STM32F0
6868

6969
* Definitely ___will not___ work: Uno (classic to R3), Nano (classic & Every), Leonardo/Duemilanove, Micro, Pro, Esplora, Teensy 2/LC, STM8 (|32<256kB), ATtiny (any)
7070

src/HydroDefines.h

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@
5555
#define min(a,b) ((a)<(b)?(a):(b))
5656
#define max(a,b) ((a)>(b)?(a):(b))
5757
#endif
58+
#if defined(CORE_TEENSY) // Missing abs
59+
#define abs(x) ((x)>0?(x):-(x))
60+
#endif
5861
#ifndef RANDOM_MAX // Missing RANDOM_MAX
5962
#if defined(RAND_MAX)
6063
#define RANDOM_MAX RAND_MAX
@@ -812,23 +815,22 @@ class HydroRail;
812815
#define SETUP_ENUM_IL3820_V2 112
813816
#define SETUP_ENUM_ST7789 113
814817
#define SETUP_ENUM_ILI9341 114
815-
#define SETUP_ENUM_TFT 115
816-
#define SETUP_ENUM_RotaryEncoderOk 116
817-
#define SETUP_ENUM_RotaryEncoderOkLR 117
818-
#define SETUP_ENUM_UpDownButtonsOk 118
819-
#define SETUP_ENUM_UpDownButtonsOkLR 119
820-
#define SETUP_ENUM_UpDownESP32TouchOk 120
821-
#define SETUP_ENUM_UpDownESP32TouchOkLR 121
822-
#define SETUP_ENUM_AnalogJoystickOk 122
823-
#define SETUP_ENUM_Matrix2x2UpDownButtonsOkL 123
824-
#define SETUP_ENUM_Matrix3x4Keyboard_OptRotEncOk 124
825-
#define SETUP_ENUM_Matrix3x4Keyboard_OptRotEncOkLR 125
826-
#define SETUP_ENUM_Matrix4x4Keyboard_OptRotEncOk 126
827-
#define SETUP_ENUM_Matrix4x4Keyboard_OptRotEncOkLR 127
828-
#define SETUP_ENUM_ResistiveTouch 128
829-
#define SETUP_ENUM_TouchScreen 139
830-
#define SETUP_ENUM_TFTTouch 130
831-
#define SETUP_ENUM_RemoteControl 131
818+
#define SETUP_ENUM_RotaryEncoderOk 115
819+
#define SETUP_ENUM_RotaryEncoderOkLR 116
820+
#define SETUP_ENUM_UpDownButtonsOk 117
821+
#define SETUP_ENUM_UpDownButtonsOkLR 118
822+
#define SETUP_ENUM_UpDownESP32TouchOk 119
823+
#define SETUP_ENUM_UpDownESP32TouchOkLR 120
824+
#define SETUP_ENUM_AnalogJoystickOk 121
825+
#define SETUP_ENUM_Matrix2x2UpDownButtonsOkL 122
826+
#define SETUP_ENUM_Matrix3x4Keyboard_OptRotEncOk 123
827+
#define SETUP_ENUM_Matrix3x4Keyboard_OptRotEncOkLR 124
828+
#define SETUP_ENUM_Matrix4x4Keyboard_OptRotEncOk 125
829+
#define SETUP_ENUM_Matrix4x4Keyboard_OptRotEncOkLR 126
830+
#define SETUP_ENUM_ResistiveTouch 127
831+
#define SETUP_ENUM_TouchScreen 128
832+
#define SETUP_ENUM_TFTTouch 129
833+
#define SETUP_ENUM_RemoteControl 130
832834
// Checks setup defines for equality, first param SETUP_XXX is substituted (possibly to 0), second param literal should be defined (for non-zero substitution)
833835
#define IS_SETUP_AS(X,Y) JOIN(SETUP_ENUM,X) == SETUP_ENUM_##Y
834836
// Checks setup defines for inequality, first param SETUP_XXX is substituted (possibly to 0), second param literal should be defined (for non-zero substitution)

src/HydroMeasurements.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ struct HydroMeasurement {
4141
time_t timestamp; // Time event recorded (UTC)
4242
hframe_t frame; // Polling frame # measurement taken on, or 0 if not-set else 1 if user-set
4343

44-
inline HydroMeasurement() : type(Unknown), frame(0), timestamp(unixNow()) { ; }
44+
inline HydroMeasurement() : type(Unknown), timestamp(unixNow()), frame(0) { ; }
4545
inline HydroMeasurement(int classType, time_t timestampIn, hframe_t frameIn) : type((typeof(type))classType), timestamp(timestampIn), frame(frameIn) { ; }
4646
HydroMeasurement(int classType, time_t timestamp = 0);
4747
HydroMeasurement(const HydroMeasurementData *dataIn);

src/shared/HydroDisplayDrivers.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Hydruino Display Drivers
44
*/
55

6-
#include "HydruinoUI.h"
6+
#include <Hydruino.h>
77
#ifdef HYDRO_USE_GUI
88

99
static inline const u8g2_cb_t *dispRotToU8g2Rot(Hydro_DisplayRotation displayRotation)

src/shared/HydroUIDefines.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#define HYDRO_UI_UPDATE_SPEED 10
1313
#elif F_SPD >= 32000000
1414
#define HYDRO_UI_UPDATE_SPEED 5
15-
#elif F_SPD >= 16000000
15+
#else
1616
#define HYDRO_UI_UPDATE_SPEED 2
1717
#endif
1818

src/shared/screens/HydroOverviewGFX.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ void randomStarColor(uint8_t* r, uint8_t* g, uint8_t* b) {
3434
*r = 255; *g = 204; *b = 111;
3535
break;
3636
}
37-
int randVals[3] = {random(20),random(25),random(20)};
37+
int randVals[3] = {(int)random(20),(int)random(25),(int)random(20)};
3838
*r = constrain((int)(*r) + (-10 + randVals[0]), 0, 255);
3939
*g = constrain((int)(*g) + (-15 + randVals[1]), 0, 255);
4040
*b = constrain((int)(*b) + (-10 + randVals[2]), 0, 255);

0 commit comments

Comments
 (0)