Making tmTime and currentTime static

Author: r3n33

buzzer/melody_notes.h

@@ -93,6 +93,7 @@
 #define REST 0
 
 enum {
+    MELODY_NONE,
     MELODY_GOTCHI_FAULT,
     MELODY_ESC_FAULT,
     MELODY_BLE_FAIL,

command_interface.c

@@ -21,41 +21,41 @@ extern uint16_t m_ble_fus_max_data_len;
 extern void user_cfg_set(bool restart_telemetry_timer);
 extern struct gotchi_configuration gotchi_cfg_user;
 
-static lfs_file_t file;
+extern bool sync_in_progress;
+extern struct lfs_config cfg;
+extern volatile bool update_rtc;
+
+extern volatile bool log_file_active;
+
+static lfs_file_t file_command_interface;
 static uint8_t lfs_file_buf[256]; // Must be cache size
 static struct lfs_file_config lfs_file_config;
 static lfs_dir_t directory;
 static int32_t bytes_sent = -1; //file.ctz.size;
 
-void (*m_ble_tx_logbuffer)(unsigned char *data, unsigned int len);
+static void (*m_ble_tx_logbuffer)(unsigned char *data, unsigned int len);
 static lfs_t *m_lfs;
 
 static int command_input_index = 0;
 static char command_input_buffer[ 128 ] = { 0 };
-static unsigned char command_response_buffer[512];
+static unsigned char command_response_buffer[256];
 
-extern bool sync_in_progress;
+static void (*m_update_time)(int syear, int smonth, int sday, int shour, int sminute, int ssecond);
 
-void command_interface_init(void (*ble_send_logbuffer)(unsigned char *, unsigned int), lfs_t *lfs)
+void command_interface_init(void (*ble_send_logbuffer)(unsigned char *, unsigned int), lfs_t *lfs, void (*update_time)(int, int, int, int, int, int))
 {
     ASSERT(lfs != NULL);
     ASSERT(ble_send_logbuffer != NULL);
     m_lfs = lfs;
     m_ble_tx_logbuffer = ble_send_logbuffer;
+    m_update_time = update_time;
 
     // Prepare the static file buffer
 	memset(&lfs_file_config, 0, sizeof(struct lfs_file_config));
 	lfs_file_config.buffer = lfs_file_buf;
 	lfs_file_config.attr_count = 0;
 }
 
-extern time_t currentTime;
-extern struct tm * tmTime;
-extern struct lfs_config cfg;
-extern volatile bool update_rtc;
-
-extern volatile bool log_file_active;
-
 void command_interface_process_byte(char incoming)
 {
     command_input_buffer[ command_input_index++ ] = incoming;
@@ -88,7 +88,7 @@ void command_interface_process_byte(char incoming)
                 if(strncmp(command_input_buffer, "cat", 3) == 0)
                 {
                     // Set the file position to what we've received on the client side
-                    lfs_file_seek(m_lfs, &file, atoi(command_input_buffer+4), LFS_SEEK_SET);
+                    lfs_file_seek(m_lfs, &file_command_interface, atoi(command_input_buffer+4), LFS_SEEK_SET);
                 }
                 // Continue to send data to the client
                 command_interface_continue_transfer(command_input_buffer);
@@ -126,13 +126,7 @@ void command_interface_process_byte(char incoming)
                 NRF_LOG_FLUSH();
 
                 // Update time in memory
-                tmTime->tm_year = syear - 1900;
-                tmTime->tm_mon = smonth - 1;
-                tmTime->tm_mday = sday;
-                tmTime->tm_hour = shour;
-                tmTime->tm_min = sminute;
-                tmTime->tm_sec = ssecond;
-                currentTime = mktime(tmTime);
+                m_update_time(syear, smonth, sday, shour, sminute, ssecond);
 
                 // Update time on RTC
                 update_rtc = true;
@@ -189,7 +183,7 @@ void command_interface_process_byte(char incoming)
 
             NRF_LOG_INFO("filename %s", filename);
             NRF_LOG_FLUSH();
-            if(lfs_file_opencfg(m_lfs, &file, filename, LFS_O_RDONLY, &lfs_file_config) >= 0)
+            if(lfs_file_opencfg(m_lfs, &file_command_interface, filename, LFS_O_RDONLY, &lfs_file_config) >= 0)
             {
                 sprintf((char *)command_response_buffer, "cat,%s", filename);
                 m_ble_tx_logbuffer(command_response_buffer, (size_t)strlen((const char *)command_response_buffer));
@@ -358,7 +352,7 @@ void command_interface_process_byte(char incoming)
             NRF_LOG_FLUSH();
             if (sync_in_progress)
             {
-                int close_result = lfs_file_close(m_lfs, &file);
+                int close_result = lfs_file_close(m_lfs, &file_command_interface);
                 NRF_LOG_INFO("lfs close result: %d", close_result);
                 NRF_LOG_FLUSH();
                 sync_in_progress = false;
@@ -417,23 +411,23 @@ void command_interface_continue_transfer(char* command)
         NRF_LOG_INFO("command_interface_continue_transfer(TRANSFER_MODE_CAT)");
         NRF_LOG_FLUSH();
 
-        if(bytes_sent >= file.ctz.size)
+        if(bytes_sent >= file_command_interface.ctz.size)
         {
             m_ble_tx_logbuffer((unsigned char *)"cat,complete", strlen("cat,complete"));
 
             NRF_LOG_INFO("finished cat");
             NRF_LOG_FLUSH();
 
-            int close_result = lfs_file_close(m_lfs, &file);
+            int close_result = lfs_file_close(m_lfs, &file_command_interface);
 
             NRF_LOG_INFO("cat close result: %d", close_result);
             NRF_LOG_FLUSH();
 
             sync_in_progress = false;
         }
-        else if(bytes_sent < file.ctz.size)
+        else if(bytes_sent < file_command_interface.ctz.size)
         {
-            int32_t read_response = lfs_file_read(m_lfs, &file, &command_response_buffer, m_ble_fus_max_data_len);
+            int32_t read_response = lfs_file_read(m_lfs, &file_command_interface, &command_response_buffer, m_ble_fus_max_data_len);
             if(read_response > 0)
             {
                 m_ble_tx_logbuffer(command_response_buffer, read_response);

command_interface.h

@@ -12,7 +12,11 @@ enum{
 
 
 void command_interface_process_byte( char incoming );
-void command_interface_init(void (*ble_send_logbuffer)(unsigned char *, unsigned int), lfs_t *lfs );
+void command_interface_init(
+    void (*ble_send_logbuffer)(unsigned char *, unsigned int),
+    lfs_t *lfs,
+    void (*update_time)(int, int, int, int, int, int)
+);
 void command_interface_continue_transfer();
 
 

main.c

@@ -128,15 +128,26 @@ void i2c_oled_comm_handle(uint8_t hdl_address, uint8_t *hdl_buffer, size_t hdl_b
 #include "rtc.h"
 volatile bool update_rtc = false; // Set to true to trigger I2C communication with RTC module
 volatile bool rtc_time_has_sync = false; // Set to true when the RTC has been set by GPS or Mobile app
-struct tm * tmTime;
-time_t currentTime;
+static struct tm * tmTime;
+static time_t currentTime;
 static char datetimestring[ 64 ] = { 0 };
 volatile bool log_file_active = false;
 static volatile bool write_logdata_now = false;
 static volatile bool gps_signal_locked = false;
 static time_t time_esc_last_responded; // For triggering TX and RX pin swapping
 static time_t time_gps_last_responded; // For detecting stale data
 
+void update_time(int syear, int smonth, int sday, int shour, int sminute, int ssecond)
+{
+	tmTime->tm_year = syear - 1900;
+	tmTime->tm_mon = smonth - 1;
+	tmTime->tm_mday = sday;
+	tmTime->tm_hour = shour;
+	tmTime->tm_min = sminute;
+	tmTime->tm_sec = ssecond;
+	currentTime = mktime(tmTime);
+}
+
 ////////////////////////////////////////
 // Fault tracking
 ////////////////////////////////////////
@@ -168,7 +179,7 @@ bool is_melody_playing = false;
 bool is_melody_playing_pause = false;
 uint32_t melody_next_note = 0;
 int *melody;
-
+int melody_last_alert_index = MELODY_NONE;
 
 
 uint32_t app_timer_ms(uint32_t ticks)
@@ -2122,7 +2133,7 @@ void log_file_start()
 void update_status_packet(char * buffer)
 {
 	// Update the buffer with the a status response packet
-	sprintf(buffer, "status,OK,%d,%d,%d,%d,%d,%d,%d", log_file_active, fault_count, recent_fault_index, lfs_percent_free, lfs_file_count, hgps.fix, hgps.sats_in_view);
+	sprintf(buffer, "status,OK,%d,%d,%d,%d,%d,%d,%d,%d", log_file_active, fault_count, recent_fault_index, lfs_percent_free, lfs_file_count, hgps.fix, hgps.sats_in_view, melody_last_alert_index);
 }
 
 uint16_t create_fault_packet(char * buffer)
@@ -2404,7 +2415,7 @@ int main(void) {
 	// Set RTC to trickle charge super capacitor
 	rtc_battery_charge();
 	// Get the current time from the RTC
-	rtc_get_time();
+	rtc_get_time(tmTime, &currentTime);
 	// Set the last ESC response time to now
 	time_esc_last_responded = currentTime;
 	// Set the last GPS response time to now
@@ -2465,7 +2476,7 @@ int main(void) {
 	advertising_init();
 	conn_params_init();
 	peer_manager_init();
-	command_interface_init(&ble_send_logbuffer, &lfs);
+	command_interface_init(&ble_send_logbuffer, &lfs, &update_time);
 
 	packet_init(uart_send_buffer, process_packet_vesc, PACKET_VESC);
 	packet_init(ble_send_buffer, process_packet_ble, PACKET_BLE);

rtc.c

@@ -6,8 +6,6 @@
 #include <time.h>
 
 extern const nrf_drv_twi_t m_twi_master;
-extern struct tm * tmTime;
-extern time_t currentTime;
 
 void rtc_battery_charge()
 {
@@ -82,7 +80,7 @@ static inline uint8_t bcd_decimal(uint8_t hex)
     return dec;
 }     
 
-void rtc_get_time()
+void rtc_get_time(struct tm * tmTime, time_t * currentTime)
 {
 	NRF_LOG_INFO("Requesting time from RTC");
 	NRF_LOG_FLUSH();
@@ -113,7 +111,7 @@ void rtc_get_time()
 	tmTime->tm_wday = bcd_decimal( pdata[ 4 ] ) - 1;
 	tmTime->tm_mon  = bcd_decimal( pdata[ 5 ] ) - 1;
 	tmTime->tm_year = bcd_decimal( pdata[ 6 ] ) + 100; //tm_year starts at 1900, rtc starts at 2000
-	currentTime = mktime( tmTime );
+	*currentTime = mktime( tmTime );
 
 	char dt_string[64] = {0};
 	strftime(dt_string, 64, "%Y-%m-%dT%H:%M:%S", tmTime);

rtc.h

@@ -1,11 +1,13 @@
 #ifndef RTC_H_
 #define RTC_H_
 
+#include <time.h>
+
 #define RTC_ADDRESS 0x56
 #define BIT(x) 1<<x
 
 void rtc_battery_charge();
-void rtc_set_time( int year, int month, int day, int hour, int minute, int second );
-void rtc_get_time();
+void rtc_set_time(int year, int month, int day, int hour, int minute, int second);
+void rtc_get_time(struct tm * tmTime, time_t * current_time);
 
 #endif //RTC_H_