Bugfixing for upper case

uCAN-LIN · Mar 9, 2019 · f3830a5 · f3830a5
1 parent 690566a
commit f3830a5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/embedded/Src/lin_slcan.c b/embedded/Src/lin_slcan.c
@@ -26,18 +26,23 @@ t_master_frame_table_item* slcan_get_master_table_row(open_lin_pid_t id, int8_t*
 	return &master_frame_table[i];
 }
 /*
- * t456       3112233 : can_id 0x456, can_dlc 3, data 0x11 0x22 0x33
- * T12A BCDEF 2AA55 : extended can_id 0x12ABCDEF, can_dlc 2, data 0xAA 0x55
+ * t016       3 112233 : id 0x16, dlc 3, data 0x11 0x22 0x33
+ * T02BA015 0 2 AA55 : extended id 0x2B period 0xA0 timeout 0x15 , dlc 2, data 0xAA 0x55
+ *
  * r1230 : can_id 0x123, can_dlc 0, no data, remote transmission request
  */
 
+
+//T013151502AA55
+//t0163112233
+
 uint8_t addLinMasterRow(uint8_t* line) {
     uint32_t temp;
     int8_t i,out_index;
     t_master_frame_table_item* array_ptr = 0;
     uint16_t tFrame_Max_ms;
     uint8_t offset = 0;
-    if (line[0] > 'z')
+    if (line[0] < 'Z')
     	offset = 5;
     // reset schedule table
     if (line[1] == '2')
@@ -69,14 +74,14 @@ uint8_t addLinMasterRow(uint8_t* line) {
     array_ptr->slot.data_length = temp;
 
     // type
-    if (line[0] == 'r')
+    if ((line[0] == 'r') || (line[0] == 'R'))
     	array_ptr->slot.frame_type = OPEN_LIN_FRAME_TYPE_RECEIVE;
 	else
 		array_ptr->slot.frame_type = OPEN_LIN_FRAME_TYPE_TRANSMIT;
     // data
     array_ptr->slot.data_ptr = &(lin_master_data[out_index * 8]); //data is later set in case of override
     // period
-    if (line[0] > 'z')
+    if (line[0] < 'Z') // if upper case
     {
     	if (!parseHex(&line[4], 2, &temp)) return 0;
     	array_ptr->offset_ms = temp;

diff --git a/embedded/Src/slcan.c b/embedded/Src/slcan.c
@@ -141,7 +141,7 @@ static uint8_t transmitStd(uint8_t* line) {
     bool lin_data = (line[0] == 't');
 
     slot.data_ptr = data_buff;
-    if (line[0] > 'z') return 0;
+    if (line[0] > 'Z') return 0;
     // id
     if (!parseHex(&line[1], 3, &temp)) return 0;
     	slot.pid = open_lin_data_layer_parity((open_lin_pid_t)temp); // add parity
@@ -277,7 +277,7 @@ void slCanCheckCommand()
                 if (line[0] < 'Z') slcanSetOutputChar('Z');
 				else slcanSetOutputChar('z');
                 result = terminator;
-            } else /* LIN_SLAVE */
+            } else /* Lin_Monitor */
             {
                 if (slcan_state == SLCAN_STATE_OPEN)
                 {