Fixing keywords

Author: Nathan Seidle

examples/Example1-Print_Time/Example1-Print_Time.ino

@@ -47,7 +47,7 @@ void loop() {
   }
 
   String currentDate = rtc.stringDateUSA(); //Get the current date in mm/dd/yyyy format (we're weird)
-  //String currentDate = rtc.stringDateWorld()); //Get the current date in dd/mm/yyyy format
+  //String currentDate = rtc.stringDate()); //Get the current date in dd/mm/yyyy format
   String currentTime = rtc.stringTime(); //Get the time
 
   Serial.print(currentDate);

examples/Example2-Alarm_Interrupt/Example2-Alarm_Interrupt.ino

@@ -70,7 +70,7 @@ void loop() {
   }
 
   String currentDate = rtc.stringDateUSA(); //Get the current date in mm/dd/yyyy format (we're weird)
-  //String currentDate = rtc.stringDateWorld()); //Get the current date in dd/mm/yyyy format
+  //String currentDate = rtc.stringDate()); //Get the current date in dd/mm/yyyy format
   String currentTime = rtc.stringTime(); //Get the time
 
   Serial.print(currentDate);

examples/Example3-Battery_Interrupt/Example3-Battery_Interrupt.ino

@@ -44,7 +44,7 @@ void loop() {
   }
 
   String currentDate = rtc.stringDateUSA(); //Get the current date in mm/dd/yyyy format (we're weird)
-  //String currentDate = rtc.stringDateWorld()); //Get the current date in dd/mm/yyyy format
+  //String currentDate = rtc.stringDate()); //Get the current date in dd/mm/yyyy format
   String currentTime = rtc.stringTime(); //Get the time
 
   Serial.print(currentDate);

keywords.txt

@@ -11,67 +11,61 @@ RV1805	KEYWORD1
 ###################################################################
 
 begin	KEYWORD2
-reset	KEYWORD2
-readFloatPressure	KEYWORD2
-readFloatAltitudeMeters	KEYWORD2
-readFloatAltitudeFeet	KEYWORD2
-readFloatHumidity	KEYWORD2
-readTempC	KEYWORD2
-readTempF	KEYWORD2
-readRegisterRegion	KEYWORD2
+setTime	KEYWORD2
+setHundredths	KEYWORD2
+setSeconds	KEYWORD2
+setMinutes	KEYWORD2
+setHours	KEYWORD2
+setWeekday	KEYWORD2
+setDate	KEYWORD2
+setMonth	KEYWORD2
+setYear	KEYWORD2
+
+getHundredths	KEYWORD2
+getSeconds	KEYWORD2
+getMinutes	KEYWORD2
+getHours	KEYWORD2
+getWeekday	KEYWORD2
+getDate	KEYWORD2
+getMonth	KEYWORD2
+getYear	KEYWORD2
+
+updateTime	KEYWORD2
+stringDateUSA	KEYWORD2
+stringDate	KEYWORD2
+stringTime	KEYWORD2
+
+setToCompilerTime	KEYWORD2
+is12Hour	KEYWORD2
+isPM	KEYWORD2
+set12Hour	KEYWORD2
+set24Hour	KEYWORD2
+
+status	KEYWORD2
+
+setAlarm	KEYWORD2
+setAlarmMode	KEYWORD2
+enableTrickleCharger	KEYWORD2
+disableTrickleCharger	KEYWORD2
+enableLowPower	KEYWORD2
+enableInterrupt	KEYWORD2
+disableInterrupt	KEYWORD2
+enableBatteryInterrupt	KEYWORD2
+enableAlarmInterrupt	KEYWORD2
+
+clearInterrupts	KEYWORD2
+checkBattery	KEYWORD2
+setReferenceVoltage	KEYWORD2
+
+BCDtoDEC	KEYWORD2
+DECtoBCD	KEYWORD2
+
 readRegister	KEYWORD2
-readRegisterInt16	KEYWORD2
 writeRegister	KEYWORD2
+readMultipleRegisters	KEYWORD2
+writeMultipleRegisters	KEYWORD2
 
 ###################################################################
 # Constants
 ###################################################################
 
-I2C_MODE	LITERAL1
-SPI_MODE	LITERAL1
-BME280_DIG_T1_LSB_REG	LITERAL1
-BME280_DIG_T1_MSB_REG	LITERAL1
-BME280_DIG_T2_LSB_REG	LITERAL1
-BME280_DIG_T2_MSB_REG	LITERAL1
-BME280_DIG_T3_LSB_REG	LITERAL1
-BME280_DIG_T3_MSB_REG	LITERAL1
-BME280_DIG_P1_LSB_REG	LITERAL1
-BME280_DIG_P1_MSB_REG	LITERAL1
-BME280_DIG_P2_LSB_REG	LITERAL1
-BME280_DIG_P2_MSB_REG	LITERAL1
-BME280_DIG_P3_LSB_REG	LITERAL1
-BME280_DIG_P3_MSB_REG	LITERAL1
-BME280_DIG_P4_LSB_REG	LITERAL1
-BME280_DIG_P4_MSB_REG	LITERAL1
-BME280_DIG_P5_LSB_REG	LITERAL1
-BME280_DIG_P5_MSB_REG	LITERAL1
-BME280_DIG_P6_LSB_REG	LITERAL1
-BME280_DIG_P6_MSB_REG	LITERAL1
-BME280_DIG_P7_LSB_REG	LITERAL1
-BME280_DIG_P7_MSB_REG	LITERAL1
-BME280_DIG_P8_LSB_REG	LITERAL1
-BME280_DIG_P8_MSB_REG	LITERAL1
-BME280_DIG_P9_LSB_REG	LITERAL1
-BME280_DIG_P9_MSB_REG	LITERAL1
-BME280_DIG_H1_REG	LITERAL1
-BME280_CHIP_ID_REG	LITERAL1
-BME280_RST_REG	LITERAL1
-BME280_DIG_H2_LSB_REG	LITERAL1
-BME280_DIG_H2_MSB_REG	LITERAL1
-BME280_DIG_H3_REG	LITERAL1
-BME280_DIG_H4_MSB_REG	LITERAL1
-BME280_DIG_H4_LSB_REG	LITERAL1
-BME280_DIG_H5_MSB_REG	LITERAL1
-BME280_DIG_H6_REG	LITERAL1
-BME280_CTRL_HUMIDITY_REG	LITERAL1
-BME280_STAT_REG	LITERAL1
-BME280_CTRL_MEAS_REG	LITERAL1
-BME280_CONFIG_REG	LITERAL1
-BME280_PRESSURE_MSB_REG	LITERAL1
-BME280_PRESSURE_LSB_REG	LITERAL1
-BME280_PRESSURE_XLSB_REG	LITERAL1
-BME280_TEMPERATURE_MSB_REG	LITERAL1
-BME280_TEMPERATURE_LSB_REG	LITERAL1
-BME280_TEMPERATURE_XLSB_REG	LITERAL1
-BME280_HUMIDITY_MSB_REG	LITERAL1
-BME280_HUMIDITY_LSB_REG	LITERAL1

src/SparkFun_RV1805.cpp

@@ -199,7 +199,7 @@ char* RV1805::stringDateUSA()
 }
 
 //Returns a pointer to array of chars that are the date in dd/mm/yyyy format
-char*  RV1805::stringDateWorld()
+char*  RV1805::stringDate()
 {
 	static char date[11]; //Max of dd/mm/yyyy with \0 terminator
 	sprintf(date, "%02d/%02d/20%02d", BCDtoDEC(_time[TIME_DATE]), BCDtoDEC(_time[TIME_MONTH]), BCDtoDEC(_time[TIME_YEAR]));

src/SparkFun_RV1805.h

@@ -168,7 +168,7 @@ class RV1805
 	bool updateTime(); //Update the local array with the RTC registers
 
 	char* stringDateUSA(); //Return date in mm-dd-yyyy
-	char* stringDateWorld(); //Return date in dd-mm-yyyy
+	char* stringDate(); //Return date in dd-mm-yyyy
 	char* stringTime(); //Return time hh:mm:ss with AM/PM if in 12 hour mode
 	uint8_t getHundredths();
 	uint8_t getSeconds();
@@ -215,8 +215,8 @@ class RV1805
 
     uint8_t readRegister(uint8_t addr);
     bool writeRegister(uint8_t addr, uint8_t val);
-	bool writeMultipleRegisters(uint8_t addr, uint8_t * values, uint8_t len);
 	bool readMultipleRegisters(uint8_t addr, uint8_t * dest, uint8_t len);
+	bool writeMultipleRegisters(uint8_t addr, uint8_t * values, uint8_t len);
 
 private:
 	uint8_t _time[TIME_ARRAY_LENGTH];