CamelCaseifcation of LED related functions

s/led_set_crgb_at/setCrgbAt/
s/hsv_to_rgb/hsvToRgb/
s/led_get_crgb_at/getCrgbAt/
s/led_sync/syncLeds/
s/get_led_index/getLedIndex/
s/send_led_data/sendLedData/
s/led_power_fault/ledPowerFault/
pull/365/head
Jesse Vincent 8 years ago
parent 09e596a8a2
commit b65f175343
No known key found for this signature in database
GPG Key ID: 122F5DF7108E4046

@ -61,14 +61,14 @@ void Model01::setup(void) {
} }
void Model01::led_set_crgb_at(uint8_t i, cRGB crgb) { void Model01::setCrgbAt(uint8_t i, cRGB crgb) {
if (i < 32) { if (i < 32) {
cRGB oldColor = led_get_crgb_at(i); cRGB oldColor = getCrgbAt(i);
isLEDChanged |= !(oldColor.r == crgb.r && oldColor.g == crgb.g && oldColor.b == crgb.b); isLEDChanged |= !(oldColor.r == crgb.r && oldColor.g == crgb.g && oldColor.b == crgb.b);
leftHand.ledData.leds[i] = crgb; leftHand.ledData.leds[i] = crgb;
} else if (i < 64) { } else if (i < 64) {
cRGB oldColor = led_get_crgb_at(i); cRGB oldColor = getCrgbAt(i);
isLEDChanged |= !(oldColor.r == crgb.r && oldColor.g == crgb.g && oldColor.b == crgb.b); isLEDChanged |= !(oldColor.r == crgb.r && oldColor.g == crgb.g && oldColor.b == crgb.b);
rightHand.ledData.leds[i - 32] = crgb; rightHand.ledData.leds[i - 32] = crgb;
@ -79,15 +79,15 @@ void Model01::led_set_crgb_at(uint8_t i, cRGB crgb) {
} }
} }
void Model01::led_set_crgb_at(byte row, byte col, cRGB color) { void Model01::setCrgbAt(byte row, byte col, cRGB color) {
led_set_crgb_at(key_led_map[row][col], color); setCrgbAt(key_led_map[row][col], color);
} }
uint8_t Model01::get_led_index(byte row, byte col) { uint8_t Model01::getLedIndex(byte row, byte col) {
return key_led_map[row][col]; return key_led_map[row][col];
} }
cRGB Model01::led_get_crgb_at(uint8_t i) { cRGB Model01::getCrgbAt(uint8_t i) {
if (i < 32) { if (i < 32) {
return leftHand.ledData.leds[i]; return leftHand.ledData.leds[i];
} else if (i < 64) { } else if (i < 64) {
@ -97,7 +97,7 @@ cRGB Model01::led_get_crgb_at(uint8_t i) {
} }
} }
void Model01::led_sync() { void Model01::syncLeds() {
if (!isLEDChanged) if (!isLEDChanged)
return; return;
@ -116,7 +116,7 @@ void Model01::led_sync() {
isLEDChanged = false; isLEDChanged = false;
} }
boolean Model01::led_power_fault() { boolean Model01::ledPowerFault() {
if (PINB & _BV(4)) { if (PINB & _BV(4)) {
return true; return true;
} else { } else {

@ -13,12 +13,12 @@
class Model01 { class Model01 {
public: public:
Model01(void); Model01(void);
void led_sync(void); void syncLeds(void);
void led_set_crgb_at(byte row, byte col, cRGB color); void setCrgbAt(byte row, byte col, cRGB color);
void led_set_crgb_at(uint8_t i, cRGB crgb); void setCrgbAt(uint8_t i, cRGB crgb);
cRGB led_get_crgb_at(uint8_t i); cRGB getCrgbAt(uint8_t i);
cRGB get_key_color(byte row, byte col); cRGB get_key_color(byte row, byte col);
uint8_t get_led_index(byte row, byte col); uint8_t getLedIndex(byte row, byte col);
void scan_matrix(void); void scan_matrix(void);
void read_matrix(void); void read_matrix(void);
@ -28,7 +28,7 @@ class Model01 {
void enable_scanner_power(void); void enable_scanner_power(void);
void reboot_bootloader(); void reboot_bootloader();
boolean led_power_fault(void); boolean ledPowerFault(void);
keydata_t leftHandState; keydata_t leftHandState;
keydata_t rightHandState; keydata_t rightHandState;

Loading…
Cancel
Save