Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion module/camera/src/cap_v4l.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1066,7 +1066,7 @@ bool CvCaptureCAM_V4L_K::tryIoctl(unsigned long ioctlCode, void *parameter) //co
DqbufTimeoutuSec = STIMEOUT_RESET_USEC;
// v4l2_reset();
//}
printf("camera driver reset - time: %d\n", systime() - StartTime);
printf("camera driver reset - time: %lu\n", systime() - StartTime);
}

return false;
Expand Down
12 changes: 6 additions & 6 deletions module/core/src/device/wombat/wombat_device.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ class WombatDevice : public kipr::core::Device
1,
2,
address,
(value & 0xFF00) >> 8,
(std::uint8_t)((value & 0xFF00) >> 8),
address + 1,
(value & 0x00FF) >> 0,
(std::uint8_t)((value & 0x00FF) >> 0),
'S'
};

Expand All @@ -122,13 +122,13 @@ class WombatDevice : public kipr::core::Device
1,
4,
address,
(value & 0xFF000000) >> 24,
(std::uint8_t)((value & 0xFF000000) >> 24),
address + 1,
(value & 0x00FF0000) >> 16,
(std::uint8_t)((value & 0x00FF0000) >> 16),
address + 2,
(value & 0x0000FF00) >> 8,
(std::uint8_t)((value & 0x0000FF00) >> 8),
address + 3,
(value & 0x000000FF) >> 0,
(std::uint8_t)((value & 0x000000FF) >> 0),
'S'
};

Expand Down
2 changes: 1 addition & 1 deletion module/graphics/public/kipr/graphics/graphics_characters.h
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ void graphics_print_character(int n, int x, int y, int r, int g, int b, float si
* \param size The strings's size
* \ingroup graphics
*/
void graphics_print_string(char s[], int x, int y, int r, int g, int b, float size);
void graphics_print_string(const char s[], int x, int y, int r, int g, int b, float size);


/**
Expand Down
2 changes: 1 addition & 1 deletion module/graphics/src/graphics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ inline Pixel fromTrueColor(Encoding enc, const int _0, const int _1, const int _
{
switch(enc) {
case RGB: return Pixel(_0 / 255.0, _1 / 255.0, _2 / 255.0);
case BGR: return Pixel(_2 / 255.0, _1 / 255.0, _0 / 255.0);
default: return Pixel(_2 / 255.0, _1 / 255.0, _0 / 255.0);
}
}

Expand Down
2 changes: 1 addition & 1 deletion module/graphics/src/graphics_characters.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ int __bold=0;
#endif


void graphics_print_string(char s[],int x, int y, int r, int g, int b, float size)
void graphics_print_string(const char s[],int x, int y, int r, int g, int b, float size)
{
int i,l;
l=strlen(s);
Expand Down